On 02/26, Harry Wentland wrote:
> From: Alex Hung <alex.h...@amd.com>
>
> 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.
>
> Signed-off-by: Alex Hung <alex.h...@amd.com>
> ---
> drivers/gpu/drm/drm_atomic.c | 3 +++
> drivers/gpu/drm/drm_atomic_uapi.c | 4 ++++
> drivers/gpu/drm/drm_colorop.c | 29 +++++++++++++++++++++++++++--
> include/drm/drm_colorop.h | 16 ++++++++++++++++
> include/uapi/drm/drm_mode.h | 1 +
> 5 files changed, 51 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index f7d51839ca03..af0b6338a55c 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -806,6 +806,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=%u\n", state->multiplier);
Compiler complains of unsigned int instead of llu.
> + break;
> default:
> break;
> }
> diff --git a/drivers/gpu/drm/drm_atomic_uapi.c
> b/drivers/gpu/drm/drm_atomic_uapi.c
> index 6bfe857720cd..b4ecda563728 100644
> --- a/drivers/gpu/drm/drm_atomic_uapi.c
> +++ b/drivers/gpu/drm/drm_atomic_uapi.c
> @@ -727,6 +727,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);
> @@ -752,6 +754,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->size_property) {
> *val = state->size;
> } else if (property == colorop->data_property) {
> diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c
> index 4452eaeeb242..c6cdd743de51 100644
> --- a/drivers/gpu/drm/drm_colorop.c
> +++ b/drivers/gpu/drm/drm_colorop.c
> @@ -35,7 +35,8 @@
> static const struct drm_prop_enum_list drm_colorop_type_enum_list[] = {
> { DRM_COLOROP_1D_CURVE, "1D Curve" },
> { DRM_COLOROP_1D_LUT, "1D Curve Custom LUT" },
> - { DRM_COLOROP_CTM_3X4, "3x4 Matrix"}
> + { DRM_COLOROP_CTM_3X4, "3x4 Matrix"},
> + { DRM_COLOROP_MULTIPLIER, "Multiplier"},
> };
>
> static const char * const colorop_curve_1d_type_names[] = {
> @@ -231,6 +232,29 @@ int drm_colorop_ctm_3x4_init(struct drm_device *dev,
> struct drm_colorop *colorop
> }
> EXPORT_SYMBOL(drm_colorop_ctm_3x4_init);
>
> +int drm_colorop_mult_init(struct drm_device *dev, struct drm_colorop
> *colorop,
> + struct drm_plane *plane)
> +{
> + struct drm_property *prop;
> + int ret;
> +
> + ret = drm_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_colorop_mult_init);
> +
> static void __drm_atomic_helper_colorop_duplicate_state(struct drm_colorop
> *colorop,
> struct
> drm_colorop_state *state)
> {
> @@ -333,7 +357,8 @@ EXPORT_SYMBOL(drm_colorop_reset);
> static const char * const colorop_type_name[] = {
> [DRM_COLOROP_1D_CURVE] = "1D Curve",
> [DRM_COLOROP_1D_LUT] = "1D Curve Custom LUT",
> - [DRM_COLOROP_CTM_3X4] = "3x4 Matrix"
> + [DRM_COLOROP_CTM_3X4] = "3x4 Matrix",
> + [DRM_COLOROP_MULTIPLIER] = "Multiplier",
> };
>
> /**
> diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h
> index 8adc7ece3bd1..f9f83644cc9f 100644
> --- a/include/drm/drm_colorop.h
> +++ b/include/drm/drm_colorop.h
> @@ -64,6 +64,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;
> +
> /**
> * @size:
> *
> @@ -186,6 +193,13 @@ struct drm_colorop {
> */
> struct drm_property *curve_1d_type_property;
>
> + /**
> + * @multiplier_property:
> + *
> + * Multiplier property for plane gain
> + */
> + struct drm_property *multiplier_property;
> +
> /**
> * @size_property:
> *
> @@ -246,6 +260,8 @@ int drm_colorop_curve_1d_lut_init(struct drm_device *dev,
> struct drm_colorop *co
> struct drm_plane *plane, uint32_t lut_size);
> int drm_colorop_ctm_3x4_init(struct drm_device *dev, struct drm_colorop
> *colorop,
> struct drm_plane *plane);
> +int drm_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 07fd66dc477c..754fd4c48123 100644
> --- a/include/uapi/drm/drm_mode.h
> +++ b/include/uapi/drm/drm_mode.h
> @@ -876,6 +876,7 @@ enum drm_colorop_type {
> DRM_COLOROP_1D_CURVE,
> DRM_COLOROP_1D_LUT,
> DRM_COLOROP_CTM_3X4,
> + DRM_COLOROP_MULTIPLIER,
> };
>
> /**
> --
> 2.44.0
>
