Re: [PATCH v2 1/8] drm: Add optional COLOR_ENCODING and COLOR_RANGE properties to drm_plane
On Mon, Feb 19, 2018 at 10:28:23PM +0200, Ville Syrjala wrote: > From: Jyri Sarha > > Add a standard optional properties to support different non RGB color > 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. > > v2: Add/fix kerneldocs, verify bitmasks (danvet) > > Cc: Harry Wentland > Cc: Daniel Vetter > Cc: Daniel Stone > Cc: Russell King - ARM Linux > Cc: Ilia Mirkin > Cc: Hans Verkuil > Cc: Uma Shankar > Cc: Shashank Sharma > Reviewed-by: Ville Syrjälä > Signed-off-by: Jyri Sarha > [vsyrjala v2: Add/fix kerneldocs, verify bitmasks] > Signed-off-by: Ville Syrjälä Reviewed-by: Daniel Vetter > --- > drivers/gpu/drm/drm_atomic.c | 8 +++ > drivers/gpu/drm/drm_color_mgmt.c | 103 > +++ > include/drm/drm_color_mgmt.h | 19 > include/drm/drm_plane.h | 32 > 4 files changed, 162 insertions(+) > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 46733d534587..452a0b0bafbc 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -759,6 +759,10 @@ static 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); > @@ -818,6 +822,10 @@ drm_atomic_plane_get_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 0d002b045bd2..4b83e078d3e9 100644 > --- a/drivers/gpu/drm/drm_color_mgmt.c > +++ b/drivers/gpu/drm/drm_color_mgmt.c > @@ -88,6 +88,20 @@ > * 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. > + * > + * Support for different non RGB color encodings is controlled through > + * &drm_plane specific COLOR_ENCODING and COLOR_RANGE properties. They > + * are set up by calling drm_plane_create_color_properties(). > + * > + * "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. > */ > > /** > @@ -339,3 +353,92 @@ int drm_mode_gamma_get_ioctl(struct drm_device *dev, > drm_modeset_unlock(&crtc->mutex); > return ret; > } > + > +static const char * const 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 const char * const 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 > + * @plane: plane object > + * @supported_encodings: bitfield indicating supported color 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 @plane. The supported encodings and ranges should > + * be provided in supported_encodings and supported_ranges bitmasks. > + * Each bit set in the bitmask indicates that its number as enum > + * value is supported. > + */ > +int drm_plane_create_color_properties(struct drm_plane *plane, > +
[PATCH v2 1/8] drm: Add optional COLOR_ENCODING and COLOR_RANGE properties to drm_plane
From: Jyri Sarha Add a standard optional properties to support different non RGB color 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. v2: Add/fix kerneldocs, verify bitmasks (danvet) Cc: Harry Wentland Cc: Daniel Vetter Cc: Daniel Stone Cc: Russell King - ARM Linux Cc: Ilia Mirkin Cc: Hans Verkuil Cc: Uma Shankar Cc: Shashank Sharma Reviewed-by: Ville Syrjälä Signed-off-by: Jyri Sarha [vsyrjala v2: Add/fix kerneldocs, verify bitmasks] Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/drm_atomic.c | 8 +++ drivers/gpu/drm/drm_color_mgmt.c | 103 +++ include/drm/drm_color_mgmt.h | 19 include/drm/drm_plane.h | 32 4 files changed, 162 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 46733d534587..452a0b0bafbc 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -759,6 +759,10 @@ static 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); @@ -818,6 +822,10 @@ drm_atomic_plane_get_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 0d002b045bd2..4b83e078d3e9 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -88,6 +88,20 @@ * 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. + * + * Support for different non RGB color encodings is controlled through + * &drm_plane specific COLOR_ENCODING and COLOR_RANGE properties. They + * are set up by calling drm_plane_create_color_properties(). + * + * "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. */ /** @@ -339,3 +353,92 @@ int drm_mode_gamma_get_ioctl(struct drm_device *dev, drm_modeset_unlock(&crtc->mutex); return ret; } + +static const char * const 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 const char * const 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 + * @plane: plane object + * @supported_encodings: bitfield indicating supported color 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 @plane. The supported encodings and ranges should + * be provided in supported_encodings and supported_ranges bitmasks. + * Each bit set in the bitmask indicates that its number as enum + * value is 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_devi