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

Commit c36a2a6d authored by Daniel Vetter's avatar Daniel Vetter Committed by Eric Anholt
Browse files

drm/i915: fix tiling limits for i915 class hw v2 



Current code is definitely crap: Largest pitch allowed spills into
the TILING_Y bit of the fence registers ... :(

I've rewritten the limits check under the assumption that 3rd gen hw
has a 3d pitch limit of 8kb (like 2nd gen). This is supported by an
otherwise totally misleading XXX comment.

This bug mostly resulted in tiling-corrupted pixmaps because the kernel
allowed too wide buffers to be tiled. Bug brought to the light by the
xf86-video-intel 2.11 release because that unconditionally enabled
tiling for pixmaps, relying on the kernel to check things. Tiling for
the framebuffer was not affected because the ddx does some additional
checks there ensure the buffer is within hw-limits.

v2: Instead of computing the value that would be written into the
hw fence registers and then checking the limits simply check whether
the stride is above the 8kb limit. To better document the hw, add
some WARN_ONs in i915_write_fence_reg like I've done for the i830
case (using the right limits).

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27449


Tested-by: default avatarAlexander Lam <lambchop468@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 3143751f

drivers/gpu/drm/i915/i915_gem.c

+6 −0
Original line number Diff line number Diff line
@@ -2362,6 +2362,12 @@ static void i915_write_fence_reg(struct drm_i915_fence_reg *reg) 
	pitch_val = obj_priv->stride / tile_width;

	pitch_val = ffs(pitch_val) - 1;



	if (obj_priv->tiling_mode == I915_TILING_Y &&

	    HAS_128_BYTE_Y_TILING(dev))

		WARN_ON(pitch_val > I830_FENCE_MAX_PITCH_VAL);

	else

		WARN_ON(pitch_val > I915_FENCE_MAX_PITCH_VAL);



	val = obj_priv->gtt_offset;

	if (obj_priv->tiling_mode == I915_TILING_Y)

		val |= 1 << I830_FENCE_TILING_Y_SHIFT;

drivers/gpu/drm/i915/i915_gem_tiling.c

+9 −13
Original line number Diff line number Diff line
@@ -202,22 +202,18 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode) 
		 * reg, so dont bother to check the size */

		if (stride / 128 > I965_FENCE_MAX_PITCH_VAL)

			return false;

	} else if (IS_I9XX(dev)) {

		uint32_t pitch_val = ffs(stride / tile_width) - 1;

	} else if (IS_GEN3(dev) || IS_GEN2(dev)) {

		if (stride > 8192)

			return false;



		/* XXX: For Y tiling, FENCE_MAX_PITCH_VAL is actually 6 (8KB)

		 * instead of 4 (2KB) on 945s.

		 */

		if (pitch_val > I915_FENCE_MAX_PITCH_VAL ||

		    size > (I830_FENCE_MAX_SIZE_VAL << 20))

		if (IS_GEN3(dev)) {

			if (size > I830_FENCE_MAX_SIZE_VAL << 20)

				return false;

		} else {

		uint32_t pitch_val = ffs(stride / tile_width) - 1;



		if (pitch_val > I830_FENCE_MAX_PITCH_VAL ||

		    size > (I830_FENCE_MAX_SIZE_VAL << 19))

			if (size > I830_FENCE_MAX_SIZE_VAL << 19)

				return false;

		}

	}



	/* 965+ just needs multiples of tile width */

	if (IS_I965G(dev)) {

drivers/gpu/drm/i915/i915_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ 
#define   I830_FENCE_SIZE_BITS(size)	((ffs((size) >> 19) - 1) << 8)

#define   I830_FENCE_PITCH_SHIFT	4

#define   I830_FENCE_REG_VALID		(1<<0)

#define   I915_FENCE_MAX_PITCH_VAL	0x10

#define   I915_FENCE_MAX_PITCH_VAL	4

#define   I830_FENCE_MAX_PITCH_VAL	6

#define   I830_FENCE_MAX_SIZE_VAL	(1<<8)