drm/i915: set swizzling to none on VLV
authorJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 2 Oct 2012 22:43:46 +0000 (17:43 -0500)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 3 Oct 2012 07:15:29 +0000 (09:15 +0200)
We don't have bit 6 swizzling on VLV, so this function is easy.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem_tiling.c

index 8093ecd2ea31906793be3d29f6909fc5fbc12f74..71084ed0aa308035f441da94c1063a312e67e62c 100644 (file)
@@ -92,7 +92,10 @@ 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 (INTEL_INFO(dev)->gen >= 6) {
+       if (IS_VALLEYVIEW(dev)) {
+               swizzle_x = I915_BIT_6_SWIZZLE_NONE;
+               swizzle_y = I915_BIT_6_SWIZZLE_NONE;
+       } else if (INTEL_INFO(dev)->gen >= 6) {
                uint32_t dimm_c0, dimm_c1;
                dimm_c0 = I915_READ(MAD_DIMM_C0);
                dimm_c1 = I915_READ(MAD_DIMM_C1);