diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-04 07:52:31 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-04 08:09:22 +0100 |
| commit | d72d908b5619896fe7832b0c4c408e664ffe4e69 (patch) | |
| tree | 21cd60b0c85576d2dcf8ceb91a3091a24b31d85c /drivers/gpu/drm/i915/i915_gem_tiling.c | |
| parent | 27c01aaef041f1fa3908c0330ff86d345523c3dc (diff) | |
| download | linux-d72d908b5619896fe7832b0c4c408e664ffe4e69.tar.gz linux-d72d908b5619896fe7832b0c4c408e664ffe4e69.tar.bz2 linux-d72d908b5619896fe7832b0c4c408e664ffe4e69.zip | |
drm/i915: Mark up i915_gem_active for locking annotation
The future annotations will track the locking used for access to ensure
that it is always sufficient. We make the preparations now to present
the API ahead and to make sure that GCC can eliminate the unused
parameter.
Before: 6298417 3619610 696320 10614347 a1f64b vmlinux
After: 6298417 3619610 696320 10614347 a1f64b vmlinux
(with i915 builtin)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470293567-10811-12-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_tiling.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_tiling.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index 8cef2d6b291a..fa2eb4a4f212 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -242,7 +242,8 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, } obj->fence_dirty = - !i915_gem_active_is_idle(&obj->last_fence) || + !i915_gem_active_is_idle(&obj->last_fence, + &dev->struct_mutex) || obj->fence_reg != I915_FENCE_REG_NONE; obj->tiling_mode = args->tiling_mode; |