drm/radeon: move the semaphore from the fence into the ib

It never really belonged there in the first place.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 617030727ca8..9507be0f4083 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -272,7 +272,6 @@ struct radeon_fence {
         uint64_t                        seq;
         /* RB, DMA, etc. */
         unsigned                        ring;
-        struct radeon_semaphore         *semaphore;
 };
 
 int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring);
@@ -624,13 +623,14 @@ void radeon_irq_kms_pflip_irq_put(struct radeon_device *rdev, int crtc);
  */
 
 struct radeon_ib {
-        struct radeon_sa_bo     *sa_bo;
-        uint32_t                length_dw;
-        uint64_t                gpu_addr;
-        uint32_t                *ptr;
-        struct radeon_fence     *fence;
-        unsigned                vm_id;
-        bool                    is_const_ib;
+        struct radeon_sa_bo             *sa_bo;
+        uint32_t                        length_dw;
+        uint64_t                        gpu_addr;
+        uint32_t                        *ptr;
+        struct radeon_fence             *fence;
+        unsigned                        vm_id;
+        bool                            is_const_ib;
+        struct radeon_semaphore         *semaphore;
 };
 
 struct radeon_ring {