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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a343697b87109cd8d9675ea8bce2e561051a696f.1523432341.git-series.maxime.ripard@bootlin.com

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
index 5c7ec15818c71a8c6385ad78a607c14f8e880416..131d8e88b06ce393c212a124da6c8b40d225588e 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
@@ -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;
 

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index ab59d2061e063ace6b2071e2a4e4f298fff3a09b..f4ac0f884f000b631e8f501dee9332f352382308 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -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)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
index 68556bd9dad2c42988c6f02d5be5a82d97c69cf5..c20f7ed48c8d27b29a306810d74793a8e07e3320 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
@@ -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);
        }
 

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.h b/drivers/gpu/drm/rcar-du/rcar_du_plane.h
index 890321b4665d16d241af49f2a9c62e87982a8749..5c19c69e469158e3702515883f8aec9cbebda629 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.h
@@ -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;
 };
 

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
index 2c260c33840b136fc89efdeaf958270bc61d30ab..b3bec01256961e27f7fd89ed43e77adc8f053193 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
@@ -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);
        }

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.h b/drivers/gpu/drm/rcar-du/rcar_du_vsp.h
index 4c5d7bbce6aa0388a6f6bdcabca7fb43d2b2f5c1..8a8a25c8c8e83053cb4997aa5e7448c3dc85d6d4 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.h
@@ -44,15 +44,12 @@ 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
  * @sg_tables: scatter-gather tables for the frame buffer memory
- * @alpha: value of the plane alpha property
  */
 struct rcar_du_vsp_plane_state {
        struct drm_plane_state state;
 
        const struct rcar_du_format_info *format;
        struct sg_table sg_tables[3];
-
-       unsigned int alpha;
 };
 
 static inline struct rcar_du_vsp_plane_state *