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

Unverified Commit 301a9b8d authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/rcar-du: Convert to the new generic alpha property 



Now that we have support for per-plane alpha in the core, let's use it.

Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarSean Paul <seanpaul@chromium.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a343697b87109cd8d9675ea8bce2e561051a696f.1523432341.git-series.maxime.ripard@bootlin.com
parent 7f73c10b

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

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ struct rcar_du_device { 
	struct rcar_du_vsp vsps[RCAR_DU_MAX_VSPS];



	struct {

		struct drm_property *alpha;

		struct drm_property *colorkey;

	} props;

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

+0 −5
Original line number Diff line number Diff line
@@ -407,11 +407,6 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) 


static int rcar_du_properties_init(struct rcar_du_device *rcdu)

{

	rcdu->props.alpha =

		drm_property_create_range(rcdu->ddev, 0, "alpha", 0, 255);

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

		return -ENOMEM;



	/*

	 * The color key is expressed as an RGB888 triplet stored in a 32-bit

	 * integer in XRGB8888 format. Bit 24 is used as a flag to disable (0)

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

+5 −10
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static void rcar_du_plane_setup_mode(struct rcar_du_group *rgrp, 
		rcar_du_plane_write(rgrp, index, PnALPHAR, PnALPHAR_ABIT_0);

	else

		rcar_du_plane_write(rgrp, index, PnALPHAR,

				    PnALPHAR_ABIT_X | state->alpha);

				    PnALPHAR_ABIT_X | state->state.alpha >> 8);



	pnmr = PnMR_BM_MD | state->format->pnmr;
@@ -692,11 +692,11 @@ static void rcar_du_plane_reset(struct drm_plane *plane) 


	state->hwindex = -1;

	state->source = RCAR_DU_PLANE_MEMORY;

	state->alpha = 255;

	state->colorkey = RCAR_DU_COLORKEY_NONE;

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



	plane->state = &state->state;

	plane->state->alpha = DRM_BLEND_ALPHA_OPAQUE;

	plane->state->plane = plane;

}
@@ -708,9 +708,7 @@ static int rcar_du_plane_atomic_set_property(struct drm_plane *plane, 
	struct rcar_du_plane_state *rstate = to_rcar_plane_state(state);

	struct rcar_du_device *rcdu = to_rcar_plane(plane)->group->dev;



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

		rstate->alpha = val;

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

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

		rstate->colorkey = val;

	else

		return -EINVAL;
@@ -726,9 +724,7 @@ static int rcar_du_plane_atomic_get_property(struct drm_plane *plane, 
		container_of(state, const struct rcar_du_plane_state, state);

	struct rcar_du_device *rcdu = to_rcar_plane(plane)->group->dev;



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

		*val = rstate->alpha;

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

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

		*val = rstate->colorkey;

	else

		return -EINVAL;
@@ -796,11 +792,10 @@ int rcar_du_planes_init(struct rcar_du_group *rgrp) 
		if (type == DRM_PLANE_TYPE_PRIMARY)

			continue;



		drm_object_attach_property(&plane->plane.base,

					   rcdu->props.alpha, 255);

		drm_object_attach_property(&plane->plane.base,

					   rcdu->props.colorkey,

					   RCAR_DU_COLORKEY_NONE);

		drm_plane_create_alpha_property(&plane->plane);

		drm_plane_create_zpos_property(&plane->plane, 1, 1, 7);

	}

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

+0 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ static inline struct rcar_du_plane *to_rcar_plane(struct drm_plane *plane) 
 * @state: base DRM plane state

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

 * @hwindex: 0-based hardware plane index, -1 means unused

 * @alpha: value of the plane alpha property

 * @colorkey: value of the plane colorkey property

 */

struct rcar_du_plane_state {
@@ -60,7 +59,6 @@ struct rcar_du_plane_state { 
	int hwindex;

	enum rcar_du_plane_source source;



	unsigned int alpha;

	unsigned int colorkey;

};

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

+4 −38
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ void rcar_du_vsp_enable(struct rcar_du_crtc *crtc) 
	};

	struct rcar_du_plane_state state = {

		.state = {

			.alpha = DRM_BLEND_ALPHA_OPAQUE,

			.crtc = &crtc->crtc,

			.dst.x1 = 0,

			.dst.y1 = 0,
@@ -67,7 +68,6 @@ void rcar_du_vsp_enable(struct rcar_du_crtc *crtc) 
		},

		.format = rcar_du_format_info(DRM_FORMAT_ARGB8888),

		.source = RCAR_DU_PLANE_VSPD1,

		.alpha = 255,

		.colorkey = 0,

	};
@@ -173,7 +173,7 @@ static void rcar_du_vsp_plane_setup(struct rcar_du_vsp_plane *plane) 
	struct vsp1_du_atomic_config cfg = {

		.pixelformat = 0,

		.pitch = fb->pitches[0],

		.alpha = state->alpha,

		.alpha = state->state.alpha >> 8,

		.zpos = state->state.zpos,

	};

	unsigned int i;
@@ -335,44 +335,13 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane) 
	if (state == NULL)

		return;



	state->alpha = 255;

	state->state.alpha = DRM_BLEND_ALPHA_OPAQUE;

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



	plane->state = &state->state;

	plane->state->plane = plane;

}



static int rcar_du_vsp_plane_atomic_set_property(struct drm_plane *plane,

	struct drm_plane_state *state, struct drm_property *property,

	uint64_t val)

{

	struct rcar_du_vsp_plane_state *rstate = to_rcar_vsp_plane_state(state);

	struct rcar_du_device *rcdu = to_rcar_vsp_plane(plane)->vsp->dev;



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

		rstate->alpha = val;

	else

		return -EINVAL;



	return 0;

}



static int rcar_du_vsp_plane_atomic_get_property(struct drm_plane *plane,

	const struct drm_plane_state *state, struct drm_property *property,

	uint64_t *val)

{

	const struct rcar_du_vsp_plane_state *rstate =

		container_of(state, const struct rcar_du_vsp_plane_state, state);

	struct rcar_du_device *rcdu = to_rcar_vsp_plane(plane)->vsp->dev;



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

		*val = rstate->alpha;

	else

		return -EINVAL;



	return 0;

}



static const struct drm_plane_funcs rcar_du_vsp_plane_funcs = {

	.update_plane = drm_atomic_helper_update_plane,

	.disable_plane = drm_atomic_helper_disable_plane,
@@ -380,8 +349,6 @@ static const struct drm_plane_funcs rcar_du_vsp_plane_funcs = { 
	.destroy = drm_plane_cleanup,

	.atomic_duplicate_state = rcar_du_vsp_plane_atomic_duplicate_state,

	.atomic_destroy_state = rcar_du_vsp_plane_atomic_destroy_state,

	.atomic_set_property = rcar_du_vsp_plane_atomic_set_property,

	.atomic_get_property = rcar_du_vsp_plane_atomic_get_property,

};



int rcar_du_vsp_init(struct rcar_du_vsp *vsp, struct device_node *np,
@@ -438,8 +405,7 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp, struct device_node *np, 
		if (type == DRM_PLANE_TYPE_PRIMARY)

			continue;



		drm_object_attach_property(&plane->plane.base,

					   rcdu->props.alpha, 255);

		drm_plane_create_alpha_property(&plane->plane);

		drm_plane_create_zpos_property(&plane->plane, 1, 1,

					       vsp->num_planes - 1);

	}