diff options
| author | Keith Packard | 2009-04-17 00:17:39 +0200 |
|---|---|---|
| committer | Eric Anholt | 2009-04-17 22:31:05 +0200 |
| commit | 5b0bdd6f7284ed39ee553f8a8c4f0d372c87133a (patch) | |
| tree | 205b53b4f5da4bff800e04d620fbcea1b89af3e9 /drivers/gpu | |
| parent | drm/i915: Don't let an oops get triggered from irq_emit without dma init. (diff) | |
| download | kernel-qcow2-linux-5b0bdd6f7284ed39ee553f8a8c4f0d372c87133a.tar.gz kernel-qcow2-linux-5b0bdd6f7284ed39ee553f8a8c4f0d372c87133a.tar.xz kernel-qcow2-linux-5b0bdd6f7284ed39ee553f8a8c4f0d372c87133a.zip | |
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: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_tiling.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index f27e523c764f..52a059354e83 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -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) |