summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_tiling.c
diff options
context:
space:
mode:
authorJesse Barnes2011-04-06 21:16:16 +0200
committerKeith Packard2011-05-14 02:05:43 +0200
commit37808944e4d97b651de7f18a868513542de87aa0 (patch)
tree30710d6d985fa5674efdde98bd5154eedf4ef4a8 /drivers/gpu/drm/i915/i915_gem_tiling.c
parentdrm/i915: Ivy Bridge has split display and pipe control (diff)
downloadkernel-qcow2-linux-37808944e4d97b651de7f18a868513542de87aa0.tar.gz
kernel-qcow2-linux-37808944e4d97b651de7f18a868513542de87aa0.tar.xz
kernel-qcow2-linux-37808944e4d97b651de7f18a868513542de87aa0.zip
drm/i915: add swizzle/tiling support for Ivy Bridge
Treat it like Ironlake and Sandy Bridge. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_tiling.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_tiling.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 281ad3d6115d..82d70fd9e933 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -92,7 +92,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
- if (IS_GEN5(dev) || IS_GEN6(dev)) {
+ if (INTEL_INFO(dev)->gen >= 5) {
/* On Ironlake whatever DRAM config, GPU always do
* same swizzling setup.
*/