[PATCH V9 36/43] drm/colorop: Add mutliplier type
Melissa Wen
mwen at igalia.com
Mon May 12 20:02:19 UTC 2025
On 29/04/2025 22:11, Alex Hung wrote:
Typo in the commit msg: mutliplier -> multiplier
> This introduces a new drm_colorop_type: DRM_COLOROP_MULTIPLIER.
>
> It's a simple multiplier to all pixel values. The value is
> specified via a S31.32 fixed point provided via the
> "MULTIPLIER" property.
>
> Reviewed-by: Simon Ser <contact at emersion.fr>
> Signed-off-by: Alex Hung <alex.hung at amd.com>
> Reviewed-by: Daniel Stone <daniels at collabora.com>
> ---
> V9:
> - Update function names by _plane_ (Chaitanya Kumar Borah)
>
> v7:
> - Modify size_property to lut_size_property
>
> drivers/gpu/drm/drm_atomic.c | 3 +++
> drivers/gpu/drm/drm_atomic_uapi.c | 4 ++++
> drivers/gpu/drm/drm_colorop.c | 33 +++++++++++++++++++++++++++++++
> include/drm/drm_colorop.h | 16 +++++++++++++++
> include/uapi/drm/drm_mode.h | 11 +++++++++++
> 5 files changed, 67 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 1dda90554e46..907ca790689f 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -800,6 +800,9 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p,
> case DRM_COLOROP_CTM_3X4:
> drm_printf(p, "\tdata blob id=%d\n", state->data ? state->data->base.id : 0);
> break;
> + case DRM_COLOROP_MULTIPLIER:
> + drm_printf(p, "\tmultiplier=%llu\n", state->multiplier);
> + break;
> default:
> break;
> }
> diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
> index 0cd250db3981..a7f1d75bb4ea 100644
> --- a/drivers/gpu/drm/drm_atomic_uapi.c
> +++ b/drivers/gpu/drm/drm_atomic_uapi.c
> @@ -739,6 +739,8 @@ static int drm_atomic_colorop_set_property(struct drm_colorop *colorop,
> state->bypass = val;
> } else if (property == colorop->curve_1d_type_property) {
> state->curve_1d_type = val;
> + } else if (property == colorop->multiplier_property) {
> + state->multiplier = val;
> } else if (property == colorop->data_property) {
> return drm_atomic_color_set_data_property(colorop, state,
> property, val);
> @@ -764,6 +766,8 @@ drm_atomic_colorop_get_property(struct drm_colorop *colorop,
> *val = state->bypass;
> } else if (property == colorop->curve_1d_type_property) {
> *val = state->curve_1d_type;
> + } else if (property == colorop->multiplier_property) {
> + *val = state->multiplier;
> } else if (property == colorop->lut_size_property) {
> *val = colorop->lut_size;
> } else if (property == colorop->data_property) {
> diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c
> index 6c87f5b9f7f9..a3cf62c5e263 100644
> --- a/drivers/gpu/drm/drm_colorop.c
> +++ b/drivers/gpu/drm/drm_colorop.c
> @@ -66,6 +66,7 @@ static const struct drm_prop_enum_list drm_colorop_type_enum_list[] = {
> { DRM_COLOROP_1D_CURVE, "1D Curve" },
> { DRM_COLOROP_1D_LUT, "1D LUT" },
> { DRM_COLOROP_CTM_3X4, "3x4 Matrix"},
> + { DRM_COLOROP_MULTIPLIER, "Multiplier"},
> };
>
> static const char * const colorop_curve_1d_type_names[] = {
> @@ -327,6 +328,37 @@ int drm_plane_colorop_ctm_3x4_init(struct drm_device *dev, struct drm_colorop *c
> }
> EXPORT_SYMBOL(drm_plane_colorop_ctm_3x4_init);
>
> +/**
> + * drm_plane_colorop_mult_init - Initialize a DRM_COLOROP_MULTIPLIER
> + *
> + * @dev: DRM device
> + * @colorop: The drm_colorop object to initialize
> + * @plane: The associated drm_plane
> + * @return zero on success, -E value on failure
> + */
> +int drm_plane_colorop_mult_init(struct drm_device *dev, struct drm_colorop *colorop,
> + struct drm_plane *plane)
> +{
> + struct drm_property *prop;
> + int ret;
> +
> + ret = drm_plane_colorop_init(dev, colorop, plane, DRM_COLOROP_MULTIPLIER);
> + if (ret)
> + return ret;
> +
> + prop = drm_property_create_range(dev, DRM_MODE_PROP_ATOMIC, "MULTIPLIER", 0, U64_MAX);
> + if (!prop)
> + return -ENOMEM;
> +
> + colorop->multiplier_property = prop;
> + drm_object_attach_property(&colorop->base, colorop->multiplier_property, 0);
> +
> + drm_colorop_reset(colorop);
> +
> + return 0;
> +}
> +EXPORT_SYMBOL(drm_plane_colorop_mult_init);
> +
> static void __drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colorop,
> struct drm_colorop_state *state)
> {
> @@ -418,6 +450,7 @@ static const char * const colorop_type_name[] = {
> [DRM_COLOROP_1D_CURVE] = "1D Curve",
> [DRM_COLOROP_1D_LUT] = "1D LUT",
> [DRM_COLOROP_CTM_3X4] = "3x4 Matrix",
> + [DRM_COLOROP_MULTIPLIER] = "Multiplier",
> };
>
> const char *drm_get_colorop_type_name(enum drm_colorop_type type)
> diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h
> index 52e965577bd8..888184aef7a0 100644
> --- a/include/drm/drm_colorop.h
> +++ b/include/drm/drm_colorop.h
> @@ -146,6 +146,13 @@ struct drm_colorop_state {
> */
> enum drm_colorop_curve_1d_type curve_1d_type;
>
> + /**
> + * @multiplier:
> + *
> + * Multiplier to 'gain' the plane. Format is S31.32 sign-magnitude.
> + */
> + uint64_t multiplier;
> +
> /**
> * @data:
> *
> @@ -273,6 +280,13 @@ struct drm_colorop {
> */
> struct drm_property *curve_1d_type_property;
>
> + /**
> + * @multiplier_property:
> + *
> + * Multiplier property for plane gain
> + */
> + struct drm_property *multiplier_property;
> +
> /**
> * @lut_size_property:
> *
> @@ -330,6 +344,8 @@ int drm_plane_colorop_curve_1d_lut_init(struct drm_device *dev, struct drm_color
> struct drm_plane *plane, uint32_t lut_size);
> int drm_plane_colorop_ctm_3x4_init(struct drm_device *dev, struct drm_colorop *colorop,
> struct drm_plane *plane);
> +int drm_plane_colorop_mult_init(struct drm_device *dev, struct drm_colorop *colorop,
> + struct drm_plane *plane);
>
> struct drm_colorop_state *
> drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colorop);
> diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
> index dde250dd7a51..fa5e1ddaf4f0 100644
> --- a/include/uapi/drm/drm_mode.h
> +++ b/include/uapi/drm/drm_mode.h
> @@ -919,6 +919,17 @@ enum drm_colorop_type {
> * | B | | 8 9 10 12 | | B |
> */
> DRM_COLOROP_CTM_3X4,
> +
> + /**
> + * @DRM_COLOROP_MULTIPLIER:
> + *
> + * enum string "Multiplier"
> + *
> + * A simple multiplier, applied to all color values. The
> + * multiplier is specified as a S31.32 via the MULTIPLIER
> + * property.
> + */
> + DRM_COLOROP_MULTIPLIER,
> };
>
> /**
More information about the wayland-devel
mailing list