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

Commit 5b0bdd6f authored by Keith Packard's avatar Keith Packard Committed by Eric Anholt
Browse files

drm/i915: fix transition to I915_TILING_NONE 



Transitions to TILING_NONE skipped the call to unbind the object, which left
the fence register set and caused future CPU access through the GTT to
access the object in tiled mode.

Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 07f4f8bf

drivers/gpu/drm/i915/i915_gem_tiling.c

+0 −1
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, 
	mutex_lock(&dev->struct_mutex);



	if (args->tiling_mode == I915_TILING_NONE) {

		obj_priv->tiling_mode = I915_TILING_NONE;

		args->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;

	} else {

		if (args->tiling_mode == I915_TILING_X)