diff options
author | Jani Nikula <jani.nikula@intel.com> | 2016-12-07 22:48:09 +0200 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2016-12-07 23:28:33 +0200 |
commit | 73f67aa8cc3c0ab7299f2fc81049a7d8d934fef8 (patch) | |
tree | d92d6b2e7125f13ac2370e900575858966107460 /drivers/gpu/drm/i915/i915_gem_fence_reg.c | |
parent | ccc24b39a6fa3b0ba6b4310c10d7e0288ec8db10 (diff) | |
download | op-kernel-dev-73f67aa8cc3c0ab7299f2fc81049a7d8d934fef8.zip op-kernel-dev-73f67aa8cc3c0ab7299f2fc81049a7d8d934fef8.tar.gz |
drm/i915: distinguish G33 and Pineview from each other
Pineview deserves to use its own platform enum (which was already added,
unused, previously). IS_G33() no longer matches Pineview, and gets
replaced by IS_G33() || IS_PINEVIEW() or equivalent. Pineview is no
longer an outlier among platform definitions.
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1481143689-19672-1-git-send-email-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_fence_reg.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_fence_reg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.c b/drivers/gpu/drm/i915/i915_gem_fence_reg.c index d006bcb..09193cf 100644 --- a/drivers/gpu/drm/i915/i915_gem_fence_reg.c +++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.c @@ -512,8 +512,9 @@ i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv) */ swizzle_x = I915_BIT_6_SWIZZLE_NONE; swizzle_y = I915_BIT_6_SWIZZLE_NONE; - } else if (IS_MOBILE(dev_priv) || (IS_GEN3(dev_priv) && - !IS_G33(dev_priv))) { + } else if (IS_MOBILE(dev_priv) || + (IS_GEN3(dev_priv) && + !IS_G33(dev_priv) && !IS_PINEVIEW(dev_priv))) { uint32_t dcc; /* On 9xx chipsets, channel interleave by the CPU is |