Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acc83eb5 authored by Daniel Vetter's avatar Daniel Vetter Committed by Keith Packard
Browse files

drm/i915: fix swizzling on gen6+ 



Fixes tests/gem_tiled_pread on my snb. I know, mesa doesn't use this
on gen6+, but I also hate failing testcases.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 6fdd4d98

drivers/gpu/drm/i915/i915_gem_tiling.c

+4 −1
Original line number Diff line number Diff line
@@ -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.

		 */