drm/radeon: radeon_framebuffer -> drm_framebuffer

[sfrench/cifs-2.6.git] / drivers / gpu / drm / radeon / radeon_fb.c

diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 6cd99f6a4305e157f1a45d220599d647000c0571..1179034024aeafb81ea5f1b9fc911f1bf845c8d0 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -43,7 +43,7 @@
  */
 struct radeon_fbdev {
        struct drm_fb_helper helper;
-       struct radeon_framebuffer rfb;
+       struct drm_framebuffer fb;
        struct radeon_device *rdev;
 };
 
@@ -246,13 +246,13 @@ static int radeonfb_create(struct drm_fb_helper *helper,
 
        info->par = rfbdev;
 
-       ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj);
+       ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->fb, &mode_cmd, gobj);
        if (ret) {
                DRM_ERROR("failed to initialize framebuffer %d\n", ret);
                goto out;
        }
 
-       fb = &rfbdev->rfb.base;
+       fb = &rfbdev->fb;
 
        /* setup helper */
        rfbdev->helper.fb = fb;
@@ -308,15 +308,15 @@ out:
 
 static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfbdev)
 {
-       struct radeon_framebuffer *rfb = &rfbdev->rfb;
+       struct drm_framebuffer *fb = &rfbdev->fb;
 
        drm_fb_helper_unregister_fbi(&rfbdev->helper);
 
-       if (rfb->base.obj[0]) {
-               radeonfb_destroy_pinned_object(rfb->base.obj[0]);
-               rfb->base.obj[0] = NULL;
-               drm_framebuffer_unregister_private(&rfb->base);
-               drm_framebuffer_cleanup(&rfb->base);
+       if (fb->obj[0]) {
+               radeonfb_destroy_pinned_object(fb->obj[0]);
+               fb->obj[0] = NULL;
+               drm_framebuffer_unregister_private(fb);
+               drm_framebuffer_cleanup(fb);
        }
        drm_fb_helper_fini(&rfbdev->helper);
 
@@ -400,7 +400,7 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)
        if (!rdev->mode_info.rfbdev)
                return false;
 
-       if (robj == gem_to_radeon_bo(rdev->mode_info.rfbdev->rfb.base.obj[0]))
+       if (robj == gem_to_radeon_bo(rdev->mode_info.rfbdev->fb.obj[0]))
                return true;
        return false;
 }