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

Commit 2d82d188 authored by Matt Roper's avatar Matt Roper Committed by Rob Clark
Browse files

drm/msm: Switch to universal plane API's 



Use drm_universal_plane_init() and drm_crtc_init_with_planes() rather
than the legacy drm_plane_init() / drm_crtc_init().  This will ensure
that the proper primary plane is registered with the DRM (and eventually
exposed to userspace in future patches).

Cc: Rob Clark <robdclark@gmail.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent e13161af

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

+4 −1
Original line number Diff line number Diff line
@@ -740,6 +740,9 @@ void mdp4_crtc_attach(struct drm_crtc *crtc, struct drm_plane *plane) 


void mdp4_crtc_detach(struct drm_crtc *crtc, struct drm_plane *plane)

{

	/* don't actually detatch our primary plane: */

	if (to_mdp4_crtc(crtc)->plane == plane)

		return;

	set_attach(crtc, mdp4_plane_pipe(plane), NULL);

}
@@ -791,7 +794,7 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev, 


	INIT_FENCE_CB(&mdp4_crtc->pageflip_cb, pageflip_cb);



	drm_crtc_init(dev, crtc, &mdp4_crtc_funcs);

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

	drm_crtc_helper_add(crtc, &mdp4_crtc_helper_funcs);



	mdp4_plane_install_properties(mdp4_crtc->plane, &crtc->base);

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

+5 −3
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ struct drm_plane *mdp4_plane_init(struct drm_device *dev, 
	struct drm_plane *plane = NULL;

	struct mdp4_plane *mdp4_plane;

	int ret;

	enum drm_plane_type type;



	mdp4_plane = kzalloc(sizeof(*mdp4_plane), GFP_KERNEL);

	if (!mdp4_plane) {
@@ -237,9 +238,10 @@ struct drm_plane *mdp4_plane_init(struct drm_device *dev, 
	mdp4_plane->nformats = mdp4_get_formats(pipe_id, mdp4_plane->formats,

			ARRAY_SIZE(mdp4_plane->formats));



	drm_plane_init(dev, plane, 0xff, &mdp4_plane_funcs,

	type = private_plane ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY;

	drm_universal_plane_init(dev, plane, 0xff, &mdp4_plane_funcs,

				 mdp4_plane->formats, mdp4_plane->nformats,

			private_plane);

				 type);



	mdp4_plane_install_properties(plane, &plane->base);

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

+4 −1
Original line number Diff line number Diff line
@@ -524,6 +524,9 @@ void mdp5_crtc_attach(struct drm_crtc *crtc, struct drm_plane *plane) 


void mdp5_crtc_detach(struct drm_crtc *crtc, struct drm_plane *plane)

{

	/* don't actually detatch our primary plane: */

	if (to_mdp5_crtc(crtc)->plane == plane)

		return;

	set_attach(crtc, mdp5_plane_pipe(plane), NULL);

}
@@ -559,7 +562,7 @@ struct drm_crtc *mdp5_crtc_init(struct drm_device *dev, 


	INIT_FENCE_CB(&mdp5_crtc->pageflip_cb, pageflip_cb);



	drm_crtc_init(dev, crtc, &mdp5_crtc_funcs);

	drm_crtc_init_with_planes(dev, crtc, plane, NULL, &mdp5_crtc_funcs);

	drm_crtc_helper_add(crtc, &mdp5_crtc_helper_funcs);



	mdp5_plane_install_properties(mdp5_crtc->plane, &crtc->base);

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

+5 −3
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev, 
	struct drm_plane *plane = NULL;

	struct mdp5_plane *mdp5_plane;

	int ret;

	enum drm_plane_type type;



	mdp5_plane = kzalloc(sizeof(*mdp5_plane), GFP_KERNEL);

	if (!mdp5_plane) {
@@ -373,9 +374,10 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev, 
	mdp5_plane->nformats = mdp5_get_formats(pipe, mdp5_plane->formats,

			ARRAY_SIZE(mdp5_plane->formats));



	drm_plane_init(dev, plane, 0xff, &mdp5_plane_funcs,

	type = private_plane ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY;

	drm_universal_plane_init(dev, plane, 0xff, &mdp5_plane_funcs,

				 mdp5_plane->formats, mdp5_plane->nformats,

			private_plane);

				 type);



	mdp5_plane_install_properties(plane, &plane->base);