Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42eb2f72 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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: default avatarVille 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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1add20eb

drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

	}

drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -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,