diff options
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 1d067743fee0..e939cb6a91cc 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c | |||
@@ -369,11 +369,11 @@ void radeon_bo_list_fence(struct list_head *head, void *fence) | |||
369 | 369 | ||
370 | list_for_each_entry(lobj, head, list) { | 370 | list_for_each_entry(lobj, head, list) { |
371 | bo = lobj->bo; | 371 | bo = lobj->bo; |
372 | spin_lock(&bo->tbo.lock); | 372 | spin_lock(&bo->tbo.bdev->fence_lock); |
373 | old_fence = (struct radeon_fence *)bo->tbo.sync_obj; | 373 | old_fence = (struct radeon_fence *)bo->tbo.sync_obj; |
374 | bo->tbo.sync_obj = radeon_fence_ref(fence); | 374 | bo->tbo.sync_obj = radeon_fence_ref(fence); |
375 | bo->tbo.sync_obj_arg = NULL; | 375 | bo->tbo.sync_obj_arg = NULL; |
376 | spin_unlock(&bo->tbo.lock); | 376 | spin_unlock(&bo->tbo.bdev->fence_lock); |
377 | if (old_fence) { | 377 | if (old_fence) { |
378 | radeon_fence_unref(&old_fence); | 378 | radeon_fence_unref(&old_fence); |
379 | } | 379 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h index d143702b244a..fd536751f865 100644 --- a/drivers/gpu/drm/radeon/radeon_object.h +++ b/drivers/gpu/drm/radeon/radeon_object.h | |||
@@ -126,12 +126,12 @@ static inline int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, | |||
126 | r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0); | 126 | r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0); |
127 | if (unlikely(r != 0)) | 127 | if (unlikely(r != 0)) |
128 | return r; | 128 | return r; |
129 | spin_lock(&bo->tbo.lock); | 129 | spin_lock(&bo->tbo.bdev->fence_lock); |
130 | if (mem_type) | 130 | if (mem_type) |
131 | *mem_type = bo->tbo.mem.mem_type; | 131 | *mem_type = bo->tbo.mem.mem_type; |
132 | if (bo->tbo.sync_obj) | 132 | if (bo->tbo.sync_obj) |
133 | r = ttm_bo_wait(&bo->tbo, true, true, no_wait); | 133 | r = ttm_bo_wait(&bo->tbo, true, true, no_wait); |
134 | spin_unlock(&bo->tbo.lock); | 134 | spin_unlock(&bo->tbo.bdev->fence_lock); |
135 | ttm_bo_unreserve(&bo->tbo); | 135 | ttm_bo_unreserve(&bo->tbo); |
136 | return r; | 136 | return r; |
137 | } | 137 | } |