diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-09-15 11:12:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-09-16 09:15:39 +1000 |
| commit | ecb114a128d150422d22eda238cb812f6b20bf39 (patch) | |
| tree | 6cd09599363f9760fed8a210c576c984cbbeec18 /drivers/gpu/drm/radeon/r600_blit_kms.c | |
| 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/r600_blit_kms.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_blit_kms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c index 1ebfd5a6dfec..4f0d181a690c 100644 --- a/drivers/gpu/drm/radeon/r600_blit_kms.c +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c @@ -538,8 +538,8 @@ int r600_vb_ib_get(struct radeon_device *rdev) void r600_vb_ib_put(struct radeon_device *rdev) { - mutex_lock(&rdev->ib_pool.mutex); radeon_fence_emit(rdev, rdev->r600_blit.vb_ib->fence); + mutex_lock(&rdev->ib_pool.mutex); list_add_tail(&rdev->r600_blit.vb_ib->list, &rdev->ib_pool.scheduled_ibs); mutex_unlock(&rdev->ib_pool.mutex); radeon_ib_free(rdev, &rdev->r600_blit.vb_ib); |