hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/gpu/drm/radeon/radeon_sync.c
....@@ -28,7 +28,6 @@
2828 * Christian König <christian.koenig@amd.com>
2929 */
3030
31
-#include <drm/drmP.h>
3231 #include "radeon.h"
3332 #include "radeon_trace.h"
3433
....@@ -88,30 +87,30 @@
8887 */
8988 int radeon_sync_resv(struct radeon_device *rdev,
9089 struct radeon_sync *sync,
91
- struct reservation_object *resv,
90
+ struct dma_resv *resv,
9291 bool shared)
9392 {
94
- struct reservation_object_list *flist;
93
+ struct dma_resv_list *flist;
9594 struct dma_fence *f;
9695 struct radeon_fence *fence;
9796 unsigned i;
9897 int r = 0;
9998
10099 /* always sync to the exclusive fence */
101
- f = reservation_object_get_excl(resv);
100
+ f = dma_resv_get_excl(resv);
102101 fence = f ? to_radeon_fence(f) : NULL;
103102 if (fence && fence->rdev == rdev)
104103 radeon_sync_fence(sync, fence);
105104 else if (f)
106105 r = dma_fence_wait(f, true);
107106
108
- flist = reservation_object_get_list(resv);
107
+ flist = dma_resv_get_list(resv);
109108 if (shared || !flist || r)
110109 return r;
111110
112111 for (i = 0; i < flist->shared_count; ++i) {
113112 f = rcu_dereference_protected(flist->shared[i],
114
- reservation_object_held(resv));
113
+ dma_resv_held(resv));
115114 fence = to_radeon_fence(f);
116115 if (fence && fence->rdev == rdev)
117116 radeon_sync_fence(sync, fence);