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

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

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



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

v2: Catch a few more cases

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
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180525185045.29689-11-ville.syrjala@linux.intel.com


Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
parent 67ba0c56

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -665,7 +665,6 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev, 
	drm_crtc_init_with_planes(dev, crtc, plane, NULL, &mdp4_crtc_funcs,

	drm_crtc_init_with_planes(dev, crtc, plane, NULL, &mdp4_crtc_funcs,

				  NULL);

				  NULL);

	drm_crtc_helper_add(crtc, &mdp4_crtc_helper_funcs);

	drm_crtc_helper_add(crtc, &mdp4_crtc_helper_funcs);

	plane->crtc = crtc;





	return crtc;

	return crtc;

}
 
}

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -182,8 +182,6 @@ static void mdp4_plane_set_scanout(struct drm_plane *plane, 
			msm_framebuffer_iova(fb, kms->aspace, 2));

			msm_framebuffer_iova(fb, kms->aspace, 2));

	mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP3_BASE(pipe),

	mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP3_BASE(pipe),

			msm_framebuffer_iova(fb, kms->aspace, 3));

			msm_framebuffer_iova(fb, kms->aspace, 3));



	plane->fb = fb;

}

}





static void mdp4_write_csc_config(struct mdp4_kms *mdp4_kms,

static void mdp4_write_csc_config(struct mdp4_kms *mdp4_kms,

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -1198,7 +1198,6 @@ struct drm_crtc *mdp5_crtc_init(struct drm_device *dev, 
			"unref cursor", unref_cursor_worker);

			"unref cursor", unref_cursor_worker);





	drm_crtc_helper_add(crtc, &mdp5_crtc_helper_funcs);

	drm_crtc_helper_add(crtc, &mdp5_crtc_helper_funcs);

	plane->crtc = crtc;





	return crtc;

	return crtc;

}
 
}

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -1043,8 +1043,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane, 
				     src_img_w, src_img_h,

				     src_img_w, src_img_h,

				     src_x + src_w, src_y, src_w, src_h);

				     src_x + src_w, src_y, src_w, src_h);





	plane->fb = fb;



	return ret;

	return ret;

}

}