1 files changed, 20 insertions, 10 deletions

diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index f5987afcd48d..7c489d1b3514 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -574,9 +574,10 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
         struct radeon_device *rdev = dev->dev_private;
         struct radeon_framebuffer *radeon_fb;
         struct drm_gem_object *obj;
-        struct drm_radeon_gem_object *obj_priv;
+        struct radeon_bo *rbo;
         uint64_t fb_location;
         uint32_t fb_format, fb_pitch_pixels, tiling_flags;
+        int r;
 
         /* no fb bound */
         if (!crtc->fb) {
@@ -586,12 +587,21 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
 
         radeon_fb = to_radeon_framebuffer(crtc->fb);
 
+        /* Pin framebuffer & get tilling informations */
         obj = radeon_fb->obj;
-        obj_priv = obj->driver_private;
-
-        if (radeon_gem_object_pin(obj, RADEON_GEM_DOMAIN_VRAM, &fb_location)) {
+        rbo = obj->driver_private;
+        r = radeon_bo_reserve(rbo, false);
+        if (unlikely(r != 0))
+                return r;
+        r = radeon_bo_pin(rbo, RADEON_GEM_DOMAIN_VRAM, &fb_location);
+        if (unlikely(r != 0)) {
+                radeon_bo_unreserve(rbo);
                 return -EINVAL;
         }
+        radeon_bo_get_tiling_flags(rbo, &tiling_flags, NULL);
+        radeon_bo_unreserve(rbo);
+        if (tiling_flags & RADEON_TILING_MACRO)
+                fb_format |= AVIVO_D1GRPH_MACRO_ADDRESS_MODE;
 
         switch (crtc->fb->bits_per_pixel) {
         case 8:
@@ -621,11 +631,6 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
                 return -EINVAL;
         }
 
-        radeon_object_get_tiling_flags(obj->driver_private,
-                                       &tiling_flags, NULL);
-        if (tiling_flags & RADEON_TILING_MACRO)
-                fb_format |= AVIVO_D1GRPH_MACRO_ADDRESS_MODE;
-
         if (tiling_flags & RADEON_TILING_MICRO)
                 fb_format |= AVIVO_D1GRPH_TILED;
 
@@ -677,7 +682,12 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
 
         if (old_fb && old_fb != crtc->fb) {
                 radeon_fb = to_radeon_framebuffer(old_fb);
-                radeon_gem_object_unpin(radeon_fb->obj);
+                rbo = radeon_fb->obj->driver_private;
+                r = radeon_bo_reserve(rbo, false);
+                if (unlikely(r != 0))
+                        return r;
+                radeon_bo_unpin(rbo);
+                radeon_bo_unreserve(rbo);
         }
 
         /* Bytes per pixel may have changed */