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

Commit 4ff696ea authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: don't install plane properties on crtc 



This was a hold-over from the pre-atomic days and legacy userspace that
only understood CRTCs.  Fortunately we don't have any properties, so
this doesn't change anything.  But before we start growing some plane
properties, we should fix this.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 01199361

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

+0 −2
Original line number Diff line number Diff line
@@ -682,7 +682,5 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev, 
	drm_crtc_helper_add(crtc, &mdp4_crtc_helper_funcs);

	plane->crtc = crtc;



	mdp4_plane_install_properties(plane, &crtc->base);



	return crtc;

}

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h

+0 −2
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ uint32_t mdp4_get_formats(enum mdp4_pipe pipe_id, uint32_t *pixel_formats, 
				!pipe_supports_yuv(pipe_id));

}



void mdp4_plane_install_properties(struct drm_plane *plane,

		struct drm_mode_object *obj);

enum mdp4_pipe mdp4_plane_pipe(struct drm_plane *plane);

struct drm_plane *mdp4_plane_init(struct drm_device *dev,

		enum mdp4_pipe pipe_id, bool private_plane);

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

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void mdp4_plane_destroy(struct drm_plane *plane) 
}



/* helper to install properties which are common to planes and crtcs */

void mdp4_plane_install_properties(struct drm_plane *plane,

static void mdp4_plane_install_properties(struct drm_plane *plane,

		struct drm_mode_object *obj)

{

	// XXX

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

+0 −2
Original line number Diff line number Diff line
@@ -776,7 +776,5 @@ struct drm_crtc *mdp5_crtc_init(struct drm_device *dev, 
	drm_crtc_helper_add(crtc, &mdp5_crtc_helper_funcs);

	plane->crtc = crtc;



	mdp5_plane_install_properties(plane, &crtc->base);



	return crtc;

}

drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h

+0 −2
Original line number Diff line number Diff line
@@ -223,8 +223,6 @@ uint32_t mdp5_get_formats(enum mdp5_pipe pipe, uint32_t *pixel_formats, 
				!pipe_supports_yuv(pipe));

}



void mdp5_plane_install_properties(struct drm_plane *plane,

		struct drm_mode_object *obj);

uint32_t mdp5_plane_get_flush(struct drm_plane *plane);

void mdp5_plane_complete_flip(struct drm_plane *plane);

void mdp5_plane_complete_commit(struct drm_plane *plane,