diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-04-23 23:01:01 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-05-10 13:38:30 -0700 |
| commit | 31770bd49ab157c5639043ad7541c3e0c83afcc4 (patch) | |
| tree | a036ad720dac237ff7a714604d23f0c3dbe48efb /drivers/gpu/drm/i915/i915_gem_tiling.c | |
| parent | 149c36a346f63fa4be7d1432d7b1b3095a95bf47 (diff) | |
| download | linux-31770bd49ab157c5639043ad7541c3e0c83afcc4.tar.gz linux-31770bd49ab157c5639043ad7541c3e0c83afcc4.tar.bz2 linux-31770bd49ab157c5639043ad7541c3e0c83afcc4.zip | |
drm/i915: don't allow tiling changes on pinned buffers v2
Makes no sense and complicates matters for pipelined tiling changes.
So don't allow it and return -EBUSY.
v2: Fix reference leak. Thanks to Owain Ainsworth for spotting this.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_tiling.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_tiling.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index 4bdccefcf2cf..4b7c49d4257d 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -283,6 +283,11 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, return -EINVAL; } + if (obj_priv->pin_count) { + drm_gem_object_unreference_unlocked(obj); + return -EBUSY; + } + if (args->tiling_mode == I915_TILING_NONE) { args->swizzle_mode = I915_BIT_6_SWIZZLE_NONE; args->stride = 0; |