drm/qxl: Change drm_fb_helper_sys_*() calls to sys_*()

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / qxl / qxl_fb.c

diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
index 7136e521e6dba7e3bc7f9671a580ab218d138e7a..3f7c54382e5eb78e68daebaad837ed403cdc0518 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_fb.c
+++ b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -199,7 +199,7 @@ static void qxl_fb_fillrect(struct fb_info *info,
 {
        struct qxl_fbdev *qfbdev = info->par;
 
-       drm_fb_helper_sys_fillrect(info, rect);
+       sys_fillrect(info, rect);
        qxl_dirty_update(qfbdev, rect->dx, rect->dy, rect->width,
                         rect->height);
 }
@@ -209,7 +209,7 @@ static void qxl_fb_copyarea(struct fb_info *info,
 {
        struct qxl_fbdev *qfbdev = info->par;
 
-       drm_fb_helper_sys_copyarea(info, area);
+       sys_copyarea(info, area);
        qxl_dirty_update(qfbdev, area->dx, area->dy, area->width,
                         area->height);
 }
@@ -219,7 +219,7 @@ static void qxl_fb_imageblit(struct fb_info *info,
 {
        struct qxl_fbdev *qfbdev = info->par;
 
-       drm_fb_helper_sys_imageblit(info, image);
+       sys_imageblit(info, image);
        qxl_dirty_update(qfbdev, image->dx, image->dy, image->width,
                         image->height);
 }
@@ -443,11 +443,11 @@ out_unref:
                }
        }
        if (fb && ret) {
-               drm_gem_object_unreference(gobj);
+               drm_gem_object_unreference_unlocked(gobj);
                drm_framebuffer_cleanup(fb);
                kfree(fb);
        }
-       drm_gem_object_unreference(gobj);
+       drm_gem_object_unreference_unlocked(gobj);
        return ret;
 }