Commit ba49f062 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Rob Clark
Browse files

drm/msm: remove mdp5_cursor_plane_funcs 



After converting legacy cursor updates to atomic async commits
mdp5_cursor_plane_funcs just duplicates mdp5_plane_funcs now.

Cc: Rob Clark <robdclark@gmail.com>
Cc: Archit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.com>
Tested-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 224a4c97

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

+3 −22
Original line number Diff line number Diff line
@@ -245,18 +245,6 @@ static const struct drm_plane_funcs mdp5_plane_funcs = { 
		.atomic_print_state = mdp5_plane_atomic_print_state,

};



static const struct drm_plane_funcs mdp5_cursor_plane_funcs = {

		.update_plane = drm_atomic_helper_update_plane,

		.disable_plane = drm_atomic_helper_disable_plane,

		.destroy = mdp5_plane_destroy,

		.atomic_set_property = mdp5_plane_atomic_set_property,

		.atomic_get_property = mdp5_plane_atomic_get_property,

		.reset = mdp5_plane_reset,

		.atomic_duplicate_state = mdp5_plane_duplicate_state,

		.atomic_destroy_state = mdp5_plane_destroy_state,

		.atomic_print_state = mdp5_plane_atomic_print_state,

};



static int mdp5_plane_prepare_fb(struct drm_plane *plane,

				 struct drm_plane_state *new_state)

{
@@ -1108,14 +1096,7 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev, 
	mdp5_plane->nformats = mdp_get_formats(mdp5_plane->formats,

		ARRAY_SIZE(mdp5_plane->formats), false);



	if (type == DRM_PLANE_TYPE_CURSOR)

		ret = drm_universal_plane_init(dev, plane, 0xff,

				&mdp5_cursor_plane_funcs,

				mdp5_plane->formats, mdp5_plane->nformats,

				NULL, type, NULL);

	else

		ret = drm_universal_plane_init(dev, plane, 0xff,

				&mdp5_plane_funcs,

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

			mdp5_plane->formats, mdp5_plane->nformats,

			NULL, type, NULL);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE