Merge drm/drm-next into drm-intel-gt-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / display / intel_fbdev.c

diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index 05c3d4739c85bc708a4437b77374835a548d15b9..03ed4607a46d2181dded13e42398ddfffa38b944 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -124,6 +124,8 @@ static const struct fb_ops intelfb_ops = {
        .owner = THIS_MODULE,
        DRM_FB_HELPER_DEFAULT_OPS,
        .fb_set_par = intel_fbdev_set_par,
+       .fb_read = drm_fb_helper_cfb_read,
+       .fb_write = drm_fb_helper_cfb_write,
        .fb_fillrect = drm_fb_helper_cfb_fillrect,
        .fb_copyarea = drm_fb_helper_cfb_copyarea,
        .fb_imageblit = drm_fb_helper_cfb_imageblit,
@@ -254,7 +256,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
                goto out_unlock;
        }
 
-       info = drm_fb_helper_alloc_fbi(helper);
+       info = drm_fb_helper_alloc_info(helper);
        if (IS_ERR(info)) {
                drm_err(&dev_priv->drm, "Failed to allocate fb_info (%pe)\n", info);
                ret = PTR_ERR(info);
@@ -584,7 +586,7 @@ void intel_fbdev_unregister(struct drm_i915_private *dev_priv)
        if (!current_is_async())
                intel_fbdev_sync(ifbdev);
 
-       drm_fb_helper_unregister_fbi(&ifbdev->helper);
+       drm_fb_helper_unregister_info(&ifbdev->helper);
 }
 
 void intel_fbdev_fini(struct drm_i915_private *dev_priv)
@@ -627,7 +629,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous
        if (!ifbdev || !ifbdev->vma)
                goto set_suspend;
 
-       info = ifbdev->helper.fbdev;
+       info = ifbdev->helper.info;
 
        if (synchronous) {
                /* Flush any pending work to turn the console on, and then