1 files changed, 39 insertions, 24 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index cb2f16a0b8ff..66055b3d8668 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -140,7 +140,7 @@ int radeonfb_create(struct drm_device *dev,
         struct radeon_framebuffer *rfb;
         struct drm_mode_fb_cmd mode_cmd;
         struct drm_gem_object *gobj = NULL;
-        struct radeon_object *robj = NULL;
+        struct radeon_bo *rbo = NULL;
         struct device *device = &rdev->pdev->dev;
         int size, aligned_size, ret;
         u64 fb_gpuaddr;
@@ -168,14 +168,14 @@ int radeonfb_create(struct drm_device *dev,
         ret = radeon_gem_object_create(rdev, aligned_size, 0,
                         RADEON_GEM_DOMAIN_VRAM,
                         false, ttm_bo_type_kernel,
-                        false, &gobj);
+                        &gobj);
         if (ret) {
                 printk(KERN_ERR "failed to allocate framebuffer (%d %d)\n",
                        surface_width, surface_height);
                 ret = -ENOMEM;
                 goto out;
         }
-        robj = gobj->driver_private;
+        rbo = gobj->driver_private;
 
         if (fb_tiled)
                 tiling_flags = RADEON_TILING_MACRO;
@@ -192,8 +192,13 @@ int radeonfb_create(struct drm_device *dev,
         }
 #endif
 
-        if (tiling_flags)
-                radeon_object_set_tiling_flags(robj, tiling_flags | RADEON_TILING_SURFACE, mode_cmd.pitch);
+        if (tiling_flags) {
+                ret = radeon_bo_set_tiling_flags(rbo,
+                                        tiling_flags | RADEON_TILING_SURFACE,
+                                        mode_cmd.pitch);
+                if (ret)
+                        dev_err(rdev->dev, "FB failed to set tiling flags\n");
+        }
         mutex_lock(&rdev->ddev->struct_mutex);
         fb = radeon_framebuffer_create(rdev->ddev, &mode_cmd, gobj);
         if (fb == NULL) {
@@ -201,10 +206,19 @@ int radeonfb_create(struct drm_device *dev,
                 ret = -ENOMEM;
                 goto out_unref;
         }
-        ret = radeon_object_pin(robj, RADEON_GEM_DOMAIN_VRAM, &fb_gpuaddr);
+        ret = radeon_bo_reserve(rbo, false);
+        if (unlikely(ret != 0))
+                goto out_unref;
+        ret = radeon_bo_pin(rbo, RADEON_GEM_DOMAIN_VRAM, &fb_gpuaddr);
+        if (ret) {
+                radeon_bo_unreserve(rbo);
+                goto out_unref;
+        }
+        if (fb_tiled)
+                radeon_bo_check_tiling(rbo, 0, 0);
+        ret = radeon_bo_kmap(rbo, &fbptr);
+        radeon_bo_unreserve(rbo);
         if (ret) {
-                printk(KERN_ERR "failed to pin framebuffer\n");
-                ret = -ENOMEM;
                 goto out_unref;
         }
 
@@ -213,7 +227,7 @@ int radeonfb_create(struct drm_device *dev,
         *fb_p = fb;
         rfb = to_radeon_framebuffer(fb);
         rdev->fbdev_rfb = rfb;
-        rdev->fbdev_robj = robj;
+        rdev->fbdev_rbo = rbo;
 
         info = framebuffer_alloc(sizeof(struct radeon_fb_device), device);
         if (info == NULL) {
@@ -234,15 +248,7 @@ int radeonfb_create(struct drm_device *dev,
         if (ret)
                 goto out_unref;
 
-        if (fb_tiled)
-                radeon_object_check_tiling(robj, 0, 0);
-
-        ret = radeon_object_kmap(robj, &fbptr);
-        if (ret) {
-                goto out_unref;
-        }
-
-        memset_io(fbptr, 0, aligned_size);
+        memset_io(fbptr, 0xff, aligned_size);
 
         strcpy(info->fix.id, "radeondrmfb");
 
@@ -288,8 +294,12 @@ int radeonfb_create(struct drm_device *dev,
         return 0;
 
 out_unref:
-        if (robj) {
-                radeon_object_kunmap(robj);
+        if (rbo) {
+                ret = radeon_bo_reserve(rbo, false);
+                if (likely(ret == 0)) {
+                        radeon_bo_kunmap(rbo);
+                        radeon_bo_unreserve(rbo);
+                }
         }
         if (fb && ret) {
                 list_del(&fb->filp_head);
@@ -335,7 +345,8 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
 {
         struct fb_info *info;
         struct radeon_framebuffer *rfb = to_radeon_framebuffer(fb);
-        struct radeon_object *robj;
+        struct radeon_bo *rbo;
+        int r;
 
         if (!fb) {
                 return -EINVAL;
@@ -343,10 +354,14 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
         info = fb->fbdev;
         if (info) {
                 struct radeon_fb_device *rfbdev = info->par;
-                robj = rfb->obj->driver_private;
+                rbo = rfb->obj->driver_private;
                 unregister_framebuffer(info);
-                radeon_object_kunmap(robj);
-                radeon_object_unpin(robj);
+                r = radeon_bo_reserve(rbo, false);
+                if (likely(r == 0)) {
+                        radeon_bo_kunmap(rbo);
+                        radeon_bo_unpin(rbo);
+                        radeon_bo_unreserve(rbo);
+                }
                 drm_fb_helper_free(&rfbdev->helper);
                 framebuffer_release(info);
         }