Merge tag 'pm+acpi-3.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[mirror_ubuntu-hirsute-kernel.git] / drivers / gpu / drm / rcar-du / rcar_du_crtc.c

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index fbf4be316d0b675f89be45db4d820952af079287..299267db2898634fae3830c7be1180b1188ec737 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -299,7 +299,7 @@ static void rcar_du_crtc_update_base(struct rcar_du_crtc *rcrtc)
 {
        struct drm_crtc *crtc = &rcrtc->crtc;
 
-       rcar_du_plane_compute_base(rcrtc->plane, crtc->fb);
+       rcar_du_plane_compute_base(rcrtc->plane, crtc->primary->fb);
        rcar_du_plane_update_base(rcrtc->plane);
 }
 
@@ -358,10 +358,10 @@ static int rcar_du_crtc_mode_set(struct drm_crtc *crtc,
        const struct rcar_du_format_info *format;
        int ret;
 
-       format = rcar_du_format_info(crtc->fb->pixel_format);
+       format = rcar_du_format_info(crtc->primary->fb->pixel_format);
        if (format == NULL) {
                dev_dbg(rcdu->dev, "mode_set: unsupported format %08x\n",
-                       crtc->fb->pixel_format);
+                       crtc->primary->fb->pixel_format);
                ret = -EINVAL;
                goto error;
        }
@@ -377,7 +377,7 @@ static int rcar_du_crtc_mode_set(struct drm_crtc *crtc,
        rcrtc->plane->width = mode->hdisplay;
        rcrtc->plane->height = mode->vdisplay;
 
-       rcar_du_plane_compute_base(rcrtc->plane, crtc->fb);
+       rcar_du_plane_compute_base(rcrtc->plane, crtc->primary->fb);
 
        rcrtc->outputs = 0;
 
@@ -510,7 +510,7 @@ static int rcar_du_crtc_page_flip(struct drm_crtc *crtc,
        }
        spin_unlock_irqrestore(&dev->event_lock, flags);
 
-       crtc->fb = fb;
+       crtc->primary->fb = fb;
        rcar_du_crtc_update_base(rcrtc);
 
        if (event) {