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

Commit 85e0a168 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] drm: rcar-du: Add Z-order support for VSP planes 



Make the Z-order of VSP planes configurable through the zpos property,
exactly as for the native DU planes.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 41740824

drivers/gpu/drm/rcar-du/rcar_du_vsp.c

+8 −3
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static void rcar_du_vsp_plane_setup(struct rcar_du_vsp_plane *plane) 
		.pixelformat = 0,

		.pitch = fb->pitches[0],

		.alpha = state->alpha,

		.zpos = 0,

		.zpos = state->zpos,

	};

	unsigned int i;
@@ -180,8 +180,6 @@ static void rcar_du_vsp_plane_setup(struct rcar_du_vsp_plane *plane) 
		}

	}



	WARN_ON(!cfg.pixelformat);



	vsp1_du_atomic_update(plane->vsp->vsp, plane->index, &cfg);

}
@@ -269,6 +267,7 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane) 
		return;



	state->alpha = 255;

	state->zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1;



	plane->state = &state->state;

	plane->state->plane = plane;
@@ -283,6 +282,8 @@ static int rcar_du_vsp_plane_atomic_set_property(struct drm_plane *plane, 


	if (property == rcdu->props.alpha)

		rstate->alpha = val;

	else if (property == rcdu->props.zpos)

		rstate->zpos = val;

	else

		return -EINVAL;
@@ -299,6 +300,8 @@ static int rcar_du_vsp_plane_atomic_get_property(struct drm_plane *plane, 


	if (property == rcdu->props.alpha)

		*val = rstate->alpha;

	else if (property == rcdu->props.zpos)

		*val = rstate->zpos;

	else

		return -EINVAL;
@@ -378,6 +381,8 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp) 


		drm_object_attach_property(&plane->plane.base,

					   rcdu->props.alpha, 255);

		drm_object_attach_property(&plane->plane.base,

					   rcdu->props.zpos, 1);

	}



	return 0;

drivers/gpu/drm/rcar-du/rcar_du_vsp.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static inline struct rcar_du_vsp_plane *to_rcar_vsp_plane(struct drm_plane *p) 
 * @state: base DRM plane state

 * @format: information about the pixel format used by the plane

 * @alpha: value of the plane alpha property

 * @zpos: value of the plane zpos property

 */

struct rcar_du_vsp_plane_state {

	struct drm_plane_state state;
@@ -51,6 +52,7 @@ struct rcar_du_vsp_plane_state { 
	const struct rcar_du_format_info *format;



	unsigned int alpha;

	unsigned int zpos;

};



static inline struct rcar_du_vsp_plane_state *