From 670fac903e8999ed705a7244302b7d22beefd0bb Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Mon, 12 Sep 2011 20:49:16 +0200 Subject: [PATCH] --- yaml --- r: 269823 b: refs/heads/master c: acc83eb5a1e0ae7dbbf89ca2a1a943ade224bb84 h: refs/heads/master i: 269821: 30fd0815f12dbbb713e65def5423f2d489649a60 269819: 0d1f87604b94a9686694c879333cbcce66b2ca32 269815: c0778e3d9428b0b30ed5acc57706fbc7809b47cc 269807: 8b2990e7b236fc38287d7b759714c8169328ee3a 269791: 06e1c5aca573dccb3476fae723deaf89d1aee062 269759: 74988329f472a635d63b2016880b1d48c2eeafa2 269695: 663be5961e2d541c2427499cc7e9104f9e46225e 269567: 551d3ab2c9b9b80cec1f1f6de40a9d4870d1a020 269311: e1964efc94899ca54773dd387d16c51ecbfe08f4 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_tiling.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6ff854f96f89..07bf9c738729 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fdd4d98e56e0919bb324c2ab1ff66395cf3b385 +refs/heads/master: acc83eb5a1e0ae7dbbf89ca2a1a943ade224bb84 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c b/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c index 99c4faa59d8f..103da6f2d03b 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -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 >= 5) { + if (INTEL_INFO(dev)->gen >= 6) { + swizzle_x = I915_BIT_6_SWIZZLE_NONE; + swizzle_y = I915_BIT_6_SWIZZLE_NONE; + } else if (IS_GEN5(dev)) { /* On Ironlake whatever DRAM config, GPU always do * same swizzling setup. */