[PATCH RFC v3] drm: Add optinal COLOR_ENCODING and COLOR_RANGE properties to drm_plane
Eric Engestrom
eric.engestrom at imgtec.com
Mon May 15 12:39:44 UTC 2017
On Monday, 2017-05-15 14:19:09 +0300, Jyri Sarha wrote:
> Add a standard optinal properties to support different non RGB color
"optional" (same in commit title)
> encodings in DRM planes. COLOR_ENCODING select the supported non RGB
> color encoding, for instance ITU-R BT.709 YCbCr. COLOR_RANGE selects
> the value ranges within the selected color encoding. The properties
> are stored to drm_plane object to allow different set of supported
> encoding for different planes on the device.
>
> Signed-off-by: Jyri Sarha <jsarha at ti.com>
> ---
> drivers/gpu/drm/drm_atomic.c | 8 ++++
> drivers/gpu/drm/drm_color_mgmt.c | 97 ++++++++++++++++++++++++++++++++++++++++
> drivers/gpu/drm/drm_plane.c | 6 +++
> include/drm/drm_color_mgmt.h | 20 +++++++++
> include/drm/drm_plane.h | 8 ++++
> 5 files changed, 139 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 4033384..f341dda 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -774,6 +774,10 @@ int drm_atomic_plane_set_property(struct drm_plane *plane,
> state->rotation = val;
> } else if (property == plane->zpos_property) {
> state->zpos = val;
> + } else if (property == plane->color_encoding_property) {
> + state->color_encoding = val;
> + } else if (property == plane->color_range_property) {
> + state->color_range = val;
> } else if (plane->funcs->atomic_set_property) {
> return plane->funcs->atomic_set_property(plane, state,
> property, val);
> @@ -834,6 +838,10 @@ int drm_atomic_plane_set_property(struct drm_plane *plane,
> *val = state->rotation;
> } else if (property == plane->zpos_property) {
> *val = state->zpos;
> + } else if (property == plane->color_encoding_property) {
> + *val = state->color_encoding;
> + } else if (property == plane->color_range_property) {
> + *val = state->color_range;
> } else if (plane->funcs->atomic_get_property) {
> return plane->funcs->atomic_get_property(plane, state, property, val);
> } else {
> diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c
> index 533f3a3..2e04ebb 100644
> --- a/drivers/gpu/drm/drm_color_mgmt.c
> +++ b/drivers/gpu/drm/drm_color_mgmt.c
> @@ -33,6 +33,11 @@
> * properties on the &drm_crtc object. They are set up by calling
> * drm_crtc_enable_color_mgmt().
> *
> + * Support for different non RGB color encodings is controlled trough
"through"
> + * plane specific COLOR_ENCODING and COLOR_RANGE properties.
> + *
> + * The &drm_crtc object's properties are:
> + *
> * "DEGAMMA_LUT”:
> * Blob property to set the degamma lookup table (LUT) mapping pixel data
> * from the framebuffer before it is given to the transformation matrix.
> @@ -85,6 +90,18 @@
> * drm_mode_crtc_set_gamma_size(). Drivers which support both should use
> * drm_atomic_helper_legacy_gamma_set() to alias the legacy gamma ramp with the
> * "GAMMA_LUT" property above.
> + *
> + * The &drm_plane object's properties are:
> + *
> + * "COLOR_ENCODING"
> + * Optional plane enum property to support different non RGB
> + * color encodings. The driver can provide a subset of standard
> + * enum values supported by the DRM plane.
> + *
> + * "COLOR_RANGE"
> + * Optional plane enum property to support different non RGB
> + * color parameter ranges. The driver can provide a subset of
> + * standard enum values supported by the DRM plane.
> */
>
> /**
> @@ -333,3 +350,83 @@ int drm_mode_gamma_get_ioctl(struct drm_device *dev,
> drm_modeset_unlock(&crtc->mutex);
> return ret;
> }
> +
> +static char *color_encoding_name[] = {
> + [DRM_COLOR_YCBCR_BT601] = "ITU-R BT.601 YCbCr",
> + [DRM_COLOR_YCBCR_BT709] = "ITU-R BT.709 YCbCr",
> + [DRM_COLOR_YCBCR_BT2020] = "ITU-R BT.2020 YCbCr",
> +};
> +
> +static char *color_range_name[] = {
> + [DRM_COLOR_YCBCR_FULL_RANGE] = "YCbCr FULL RANGE",
> + [DRM_COLOR_YCBCR_LIMITED_RANGE] = "YCbCr LIMITED RANGE",
> +};
> +
> +/**
> + * drm_plane_create_color_properties - color encoding related plane properties
> + * @supported_encodings: bitfield indicating supported color encdings
"encodings"
> + * @supported_ranges: bitfileld indicating supported color ranges
> + * @default_encoding: default color encoding
> + * @default_range: default color range
> + *
> + * Create and attach plane specific COLOR_ENCODING and COLOR_RANGE
> + * properties to to the drm_plane object. The supported encodings and
> + * ranges should be provided in supported_encodings and
> + * supported_ranges bitmasks. Each bit set in the bitmast indicates
> + * the its number as enum value being supported.
> + */
> +int drm_plane_create_color_properties(struct drm_plane *plane,
> + u32 supported_encodings,
> + u32 supported_ranges,
> + enum drm_color_encoding default_encoding,
> + enum drm_color_range default_range)
> +{
> + struct drm_device *dev = plane->dev;
> + struct drm_property *prop;
> + struct drm_prop_enum_list enum_list[max(DRM_COLOR_ENCODING_MAX,
> + DRM_COLOR_RANGE_MAX)];
> + unsigned int i, len;
> +
> +
> + if (WARN_ON(plane->color_encoding_property != NULL) ||
> + WARN_ON(plane->color_range_property != NULL))
> + return -EEXIST;
> +
> + len = 0;
> + for (i = 0; i < DRM_COLOR_ENCODING_MAX; i++) {
> + if ((BIT(i) & supported_encodings) == 0)
> + continue;
> +
> + enum_list[i].type = i;
> + enum_list[i].name = color_encoding_name[i];
> + len++;
> + }
> +
> + prop = drm_property_create_enum(dev, DRM_MODE_PROP_ATOMIC,
> + "COLOR_ENCODING",
> + enum_list, len);
> + if (!prop)
> + return -ENOMEM;
> + plane->color_encoding_property = prop;
> + drm_object_attach_property(&plane->base, prop, default_encoding);
> +
> + len = 0;
> + for (i = 0; i < DRM_COLOR_RANGE_MAX; i++) {
> + if ((BIT(i) & supported_ranges) == 0)
> + continue;
> +
> + enum_list[i].type = i;
> + enum_list[i].name = color_range_name[i];
> + len++;
> + }
> +
> + prop = drm_property_create_enum(dev, DRM_MODE_PROP_ATOMIC,
> + "COLOR_RANGE",
> + enum_list, len);
> + if (!prop)
> + return -ENOMEM;
> + plane->color_range_property = prop;
> + drm_object_attach_property(&plane->base, prop, default_range);
> +
> + return 0;
> +}
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index fedd4d6..a6762e8 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -244,6 +244,12 @@ void drm_plane_cleanup(struct drm_plane *plane)
>
> kfree(plane->name);
>
> + if (plane->color_encoding_property)
> + drm_property_destroy(dev, plane->color_encoding_property);
> +
> + if (plane->color_range_property)
> + drm_property_destroy(dev, plane->color_range_property);
> +
> memset(plane, 0, sizeof(*plane));
> }
> EXPORT_SYMBOL(drm_plane_cleanup);
> diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h
> index 03a59cb..7a1af63 100644
> --- a/include/drm/drm_color_mgmt.h
> +++ b/include/drm/drm_color_mgmt.h
> @@ -26,6 +26,8 @@
> #include <linux/ctype.h>
>
> struct drm_crtc;
> +struct drm_plane;
> +struct drm_prop_enum_list;
>
> uint32_t drm_color_lut_extract(uint32_t user_input, uint32_t bit_precision);
>
> @@ -37,4 +39,22 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc,
> int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
> int gamma_size);
>
> +enum drm_color_encoding {
> + DRM_COLOR_YCBCR_BT601 = 0,
> + DRM_COLOR_YCBCR_BT709,
> + DRM_COLOR_YCBCR_BT2020,
> + DRM_COLOR_ENCODING_MAX,
> +};
> +
> +enum drm_color_range {
> + DRM_COLOR_YCBCR_LIMITED_RANGE = 0,
> + DRM_COLOR_YCBCR_FULL_RANGE,
> + DRM_COLOR_RANGE_MAX,
> +};
> +
> +int drm_plane_create_color_properties(struct drm_plane *plane,
> + u32 supported_encodings,
> + u32 supported_ranges,
> + enum drm_color_encoding default_encoding,
> + enum drm_color_range default_range);
> #endif
> diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
> index 9ab3e70..f4de5f9 100644
> --- a/include/drm/drm_plane.h
> +++ b/include/drm/drm_plane.h
> @@ -26,6 +26,7 @@
> #include <linux/list.h>
> #include <linux/ctype.h>
> #include <drm/drm_mode_object.h>
> +#include <drm/drm_color_mgmt.h>
>
> struct drm_crtc;
> struct drm_printer;
> @@ -112,6 +113,10 @@ struct drm_plane_state {
> unsigned int zpos;
> unsigned int normalized_zpos;
>
> + /* Color encoding for non RGB formats */
> + enum drm_color_encoding color_encoding;
> + enum drm_color_range color_range;
> +
> /* Clipped coordinates */
> struct drm_rect src, dst;
>
> @@ -523,6 +528,9 @@ struct drm_plane {
>
> struct drm_property *zpos_property;
> struct drm_property *rotation_property;
> +
> + struct drm_property *color_encoding_property;
> + struct drm_property *color_range_property;
> };
>
> #define obj_to_plane(x) container_of(x, struct drm_plane, base)
> --
> 1.9.1
>
More information about the dri-devel
mailing list