drm/i915: add swizzle/tiling support for Ivy Bridge
authorJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 6 Apr 2011 19:16:16 +0000 (12:16 -0700)
committerKeith Packard <keithp@keithp.com>
Sat, 14 May 2011 00:05:43 +0000 (17:05 -0700)
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>
drivers/gpu/drm/i915/i915_gem_tiling.c

index 281ad3d6115d08a3f40a666b60673b0d22cd6d6e..82d70fd9e933b8aff68afeffca08dca89e937fe2 100644 (file)
@@ -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.
                 */