Commit 161ad653 authored by Alexandru Gheorghe's avatar Alexandru Gheorghe

drm: rcar-du: Use __drm_atomic_helper_plane_reset instead of copying the logic

A new helper function(__drm_atomic_helper_plane_reset) has been added
for linking a plane with its state and resetting the core
properties(alpha, rotation, etc.) to their default values.
Use that instead of duplicating the logic.

__drm_atomic_helper_plane_reset initializes the alpha property to its
max value, which is defined by the drm core as DRM_BLEND_ALPHA_OPAQUE,
so nothing changes regarding the alpha value.
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarAlexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180804161530.12275-8-alexandru-cosmin.gheorghe@arm.com
parent 60252323
...@@ -690,14 +690,12 @@ static void rcar_du_plane_reset(struct drm_plane *plane) ...@@ -690,14 +690,12 @@ static void rcar_du_plane_reset(struct drm_plane *plane)
if (state == NULL) if (state == NULL)
return; return;
__drm_atomic_helper_plane_reset(plane, &state->state);
state->hwindex = -1; state->hwindex = -1;
state->source = RCAR_DU_PLANE_MEMORY; state->source = RCAR_DU_PLANE_MEMORY;
state->colorkey = RCAR_DU_COLORKEY_NONE; state->colorkey = RCAR_DU_COLORKEY_NONE;
state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1; 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;
} }
static int rcar_du_plane_atomic_set_property(struct drm_plane *plane, static int rcar_du_plane_atomic_set_property(struct drm_plane *plane,
......
...@@ -346,11 +346,8 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane) ...@@ -346,11 +346,8 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane)
if (state == NULL) if (state == NULL)
return; return;
state->state.alpha = DRM_BLEND_ALPHA_OPAQUE; __drm_atomic_helper_plane_reset(plane, &state->state);
state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1; state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1;
plane->state = &state->state;
plane->state->plane = plane;
} }
static const struct drm_plane_funcs rcar_du_vsp_plane_funcs = { static const struct drm_plane_funcs rcar_du_vsp_plane_funcs = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment