drm/msm: Stop consulting plane->fb/crtc

We want to get rid of plane->fb/crtc on atomic drivers. Stop
looking at them.

v2: Catch the plane->crtc case too

Cc: Rob Clark <robdclark@gmail.com>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20180405151400.11326-1-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
index b001699297c486ab075a76bedd3c27d0c95572ee..20f9e5de5f19fe57b90c5518afd4397498a7602d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
@@ -201,7 +201,7 @@ static void blend_setup(struct drm_crtc *crtc)
                int idx = idxs[pipe_id];
                if (idx > 0) {
                        const struct mdp_format *format =
-                                       to_mdp_format(msm_framebuffer_format(plane->fb));
+                                       to_mdp_format(msm_framebuffer_format(plane->state->fb));
                        alpha[idx-1] = format->alpha_enable;
                }
        }

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
index a9f31da7d45ad6aeebe67021bb4d8d7532655335..f2361f79fdce235339a64165a8d338cdb231315d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
@@ -526,7 +526,7 @@ static void mdp5_plane_atomic_async_update(struct drm_plane *plane,
        if (plane_enabled(new_state)) {
                struct mdp5_ctl *ctl;
                struct mdp5_pipeline *pipeline =
-                                       mdp5_crtc_get_pipeline(plane->crtc);
+                                       mdp5_crtc_get_pipeline(new_state->crtc);
                int ret;
 
                ret = mdp5_plane_mode_set(plane, new_state->crtc, new_state->fb,