1 files changed, 23 insertions, 20 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 79c988db79ad..2e41dc12cd00 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -585,8 +585,11 @@ bool radeon_semaphore_emit_signal(struct radeon_device *rdev, int ring,
                                   struct radeon_semaphore *semaphore);
 bool radeon_semaphore_emit_wait(struct radeon_device *rdev, int ring,
                                 struct radeon_semaphore *semaphore);
-void radeon_semaphore_sync_to(struct radeon_semaphore *semaphore,
-                              struct radeon_fence *fence);
+void radeon_semaphore_sync_fence(struct radeon_semaphore *semaphore,
+                                 struct radeon_fence *fence);
+void radeon_semaphore_sync_resv(struct radeon_semaphore *semaphore,
+                                struct reservation_object *resv,
+                                bool shared);
 int radeon_semaphore_sync_rings(struct radeon_device *rdev,
                                 struct radeon_semaphore *semaphore,
                                 int waiting_ring);
@@ -1855,24 +1858,24 @@ struct radeon_asic {
         } display;
         /* copy functions for bo handling */
         struct {
-                int (*blit)(struct radeon_device *rdev,
-                            uint64_t src_offset,
-                            uint64_t dst_offset,
-                            unsigned num_gpu_pages,
-                            struct radeon_fence **fence);
+                struct radeon_fence *(*blit)(struct radeon_device *rdev,
+                                             uint64_t src_offset,
+                                             uint64_t dst_offset,
+                                             unsigned num_gpu_pages,
+                                             struct reservation_object *resv);
                 u32 blit_ring_index;
-                int (*dma)(struct radeon_device *rdev,
-                           uint64_t src_offset,
-                           uint64_t dst_offset,
-                           unsigned num_gpu_pages,
-                           struct radeon_fence **fence);
+                struct radeon_fence *(*dma)(struct radeon_device *rdev,
+                                            uint64_t src_offset,
+                                            uint64_t dst_offset,
+                                            unsigned num_gpu_pages,
+                                            struct reservation_object *resv);
                 u32 dma_ring_index;
                 /* method used for bo copy */
-                int (*copy)(struct radeon_device *rdev,
-                            uint64_t src_offset,
-                            uint64_t dst_offset,
-                            unsigned num_gpu_pages,
-                            struct radeon_fence **fence);
+                struct radeon_fence *(*copy)(struct radeon_device *rdev,
+                                             uint64_t src_offset,
+                                             uint64_t dst_offset,
+                                             unsigned num_gpu_pages,
+                                             struct reservation_object *resv);
                 /* ring used for bo copies */
                 u32 copy_ring_index;
         } copy;
@@ -2833,9 +2836,9 @@ static inline void radeon_ring_write(struct radeon_ring *ring, uint32_t v)
 #define radeon_hdmi_setmode(rdev, e, m) (rdev)->asic->display.hdmi_setmode((e), (m))
 #define radeon_fence_ring_emit(rdev, r, fence) (rdev)->asic->ring[(r)]->emit_fence((rdev), (fence))
 #define radeon_semaphore_ring_emit(rdev, r, cp, semaphore, emit_wait) (rdev)->asic->ring[(r)]->emit_semaphore((rdev), (cp), (semaphore), (emit_wait))
-#define radeon_copy_blit(rdev, s, d, np, f) (rdev)->asic->copy.blit((rdev), (s), (d), (np), (f))
-#define radeon_copy_dma(rdev, s, d, np, f) (rdev)->asic->copy.dma((rdev), (s), (d), (np), (f))
-#define radeon_copy(rdev, s, d, np, f) (rdev)->asic->copy.copy((rdev), (s), (d), (np), (f))
+#define radeon_copy_blit(rdev, s, d, np, resv) (rdev)->asic->copy.blit((rdev), (s), (d), (np), (resv))
+#define radeon_copy_dma(rdev, s, d, np, resv) (rdev)->asic->copy.dma((rdev), (s), (d), (np), (resv))
+#define radeon_copy(rdev, s, d, np, resv) (rdev)->asic->copy.copy((rdev), (s), (d), (np), (resv))
 #define radeon_copy_blit_ring_index(rdev) (rdev)->asic->copy.blit_ring_index
 #define radeon_copy_dma_ring_index(rdev) (rdev)->asic->copy.dma_ring_index
 #define radeon_copy_ring_index(rdev) (rdev)->asic->copy.copy_ring_index