diff options
author | Dave Airlie <airlied@linux.ie> | 2009-09-14 21:12:56 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2009-09-15 19:15:39 -0400 |
commit | ecb114a128d150422d22eda238cb812f6b20bf39 (patch) | |
tree | 6cd09599363f9760fed8a210c576c984cbbeec18 /drivers/gpu/drm/radeon/radeon.h | |
parent | 42dea5ddb56fe10e1d9a7840ddcb1df97a208a99 (diff) |
drm/radeon/kms: IB locking dumps out a lockdep ordering issue
We sometimes lock IB then the ring and sometimes the ring then
the IB. This is mostly due to the IB locking not being well defined
about what data in the structs it actually locks. Define what I
believe is the correct behaviour and gets rid of the lock dep ordering
warning.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 99292be8bc9..ff9e4171559 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -402,6 +402,10 @@ struct radeon_ib { | |||
402 | uint32_t length_dw; | 402 | uint32_t length_dw; |
403 | }; | 403 | }; |
404 | 404 | ||
405 | /* | ||
406 | * locking - | ||
407 | * mutex protects scheduled_ibs, ready, alloc_bm | ||
408 | */ | ||
405 | struct radeon_ib_pool { | 409 | struct radeon_ib_pool { |
406 | struct mutex mutex; | 410 | struct mutex mutex; |
407 | struct radeon_object *robj; | 411 | struct radeon_object *robj; |