drm/ttm: flip the switch, and convert to dma_fence

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index 5729e9bebd9d..ba4f38916026 100644
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -400,6 +400,7 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
 {
         int32_t *msg, msg_type, handle;
         unsigned img_size = 0;
+        struct fence *f;
         void *ptr;
 
         int i, r;
@@ -409,8 +410,9 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
                 return -EINVAL;
         }
 
-        if (bo->tbo.sync_obj) {
-                r = radeon_fence_wait(bo->tbo.sync_obj, false);
+        f = reservation_object_get_excl(bo->tbo.resv);
+        if (f) {
+                r = radeon_fence_wait((struct radeon_fence *)f, false);
                 if (r) {
                         DRM_ERROR("Failed waiting for UVD message (%d)!\n", r);
                         return r;