| Message ID | 20210615141426.6001-4-wse@tuxedocomputers.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | New uAPI drm properties for color management | expand |
Am 15.06.21 um 16:14 schrieb Werner Sembach: > Add a new general drm property "active bpc" which can be used by graphic drivers > to report the applied bit depth per pixel back to userspace. > > While "max bpc" can be used to change the color depth, there was no way to check > which one actually got used. While in theory the driver chooses the best/highest > color depth within the max bpc setting a user might not be fully aware what his > hardware is or isn't capable off. This is meant as a quick way to double check > the setup. > > In the future, automatic color calibration for screens might also depend on this > information being available. > > Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> > --- > drivers/gpu/drm/drm_connector.c | 50 +++++++++++++++++++++++++++++++++ > include/drm/drm_connector.h | 8 ++++++ > 2 files changed, 58 insertions(+) > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > index da39e7ff6965..02c310c1ac2d 100644 > --- a/drivers/gpu/drm/drm_connector.c > +++ b/drivers/gpu/drm/drm_connector.c > @@ -1197,6 +1197,14 @@ static const struct drm_prop_enum_list dp_colorspaces[] = { > * drm_connector_attach_max_bpc_property() to create and attach the > * property to the connector during initialization. > * > + * active bpc: > + * This read-only range property tells userspace the pixel color bit depth > + * actually used by the hardware display engine on "the cable" on a > + * connector. The chosen value depends on hardware capabilities, both > + * display engine and connected monitor, and the "max bpc" property. > + * Drivers shall use drm_connector_attach_active_bpc_property() to install > + * this property. > + * > * Connectors also have one standardized atomic property: > * > * CRTC_ID: > @@ -2152,6 +2160,48 @@ int drm_connector_attach_max_bpc_property(struct drm_connector *connector, > } > EXPORT_SYMBOL(drm_connector_attach_max_bpc_property); > > +/** > + * drm_connector_attach_active_bpc_property - attach "active bpc" property > + * @connector: connector to attach active bpc property on. > + * @min: The minimum bit depth supported by the connector. > + * @max: The maximum bit depth supported by the connector. > + * > + * This is used to check the applied bit depth on a connector. > + * > + * Returns: > + * Zero on success, negative errno on failure. > + */ > +int drm_connector_attach_active_bpc_property(struct drm_connector *connector, int min, int max) > +{ > + struct drm_device *dev = connector->dev; > + struct drm_property *prop; > + > + if (!connector->active_bpc_property) { > + prop = drm_property_create_range(dev, DRM_MODE_PROP_IMMUTABLE, "active bpc", min, max); > + if (!prop) > + return -ENOMEM; > + > + connector->active_bpc_property = prop; > + drm_object_attach_property(&connector->base, prop, 0); > + } > + > + return 0; > +} > +EXPORT_SYMBOL(drm_connector_attach_active_bpc_property); > + > +/** > + * drm_connector_set_active_bpc_property - sets the active bits per color property for a connector > + * @connector: drm connector > + * @active_bpc: bits per color for the connector currently active on "the cable" > + * > + * Should be used by atomic drivers to update the active bits per color over a connector. > + */ > +void drm_connector_set_active_bpc_property(struct drm_connector *connector, int active_bpc) > +{ > + drm_object_property_set_value(&connector->base, connector->active_bpc_property, active_bpc); > +} > +EXPORT_SYMBOL(drm_connector_set_active_bpc_property); > + > /** > * drm_connector_attach_hdr_output_metadata_property - attach "HDR_OUTPUT_METADA" property > * @connector: connector to attach the property on. > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 714d1a01c065..eee86de62a5f 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -1380,6 +1380,12 @@ struct drm_connector { > */ > struct drm_property *max_bpc_property; > > + /** > + * @active_bpc_property: Default connector property for the active bpc > + * to be driven out of the connector. > + */ > + struct drm_property *active_bpc_property; > + > #define DRM_CONNECTOR_POLL_HPD (1 << 0) > #define DRM_CONNECTOR_POLL_CONNECT (1 << 1) > #define DRM_CONNECTOR_POLL_DISCONNECT (1 << 2) > @@ -1702,6 +1708,8 @@ int drm_connector_set_panel_orientation_with_quirk( > int width, int height); > int drm_connector_attach_max_bpc_property(struct drm_connector *connector, > int min, int max); > +int drm_connector_attach_active_bpc_property(struct drm_connector *connector, int min, int max); > +void drm_connector_set_active_bpc_property(struct drm_connector *connector, int active_bpc); > > /** > * struct drm_tile_group - Tile group metadata I looked into DSC: In both the amd and intel implementation it's: max_bpc >= uncompressed bpc >= dsc bpc Currently the patch is setting active bpc to the uncompressed bpc. I gave the DSC specification a (very brief) look and did not find any obvious mention of some kind bpc upsampling, so I guess the dsc bpc is what the user actually sees in the end. => In the next version, active bpc will be set to dsc bpc in the case dsc is active. I did not look into dithering yet, but it's next on my list.
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index da39e7ff6965..02c310c1ac2d 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1197,6 +1197,14 @@ static const struct drm_prop_enum_list dp_colorspaces[] = { * drm_connector_attach_max_bpc_property() to create and attach the * property to the connector during initialization. * + * active bpc: + * This read-only range property tells userspace the pixel color bit depth + * actually used by the hardware display engine on "the cable" on a + * connector. The chosen value depends on hardware capabilities, both + * display engine and connected monitor, and the "max bpc" property. + * Drivers shall use drm_connector_attach_active_bpc_property() to install + * this property. + * * Connectors also have one standardized atomic property: * * CRTC_ID: @@ -2152,6 +2160,48 @@ int drm_connector_attach_max_bpc_property(struct drm_connector *connector, } EXPORT_SYMBOL(drm_connector_attach_max_bpc_property); +/** + * drm_connector_attach_active_bpc_property - attach "active bpc" property + * @connector: connector to attach active bpc property on. + * @min: The minimum bit depth supported by the connector. + * @max: The maximum bit depth supported by the connector. + * + * This is used to check the applied bit depth on a connector. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_connector_attach_active_bpc_property(struct drm_connector *connector, int min, int max) +{ + struct drm_device *dev = connector->dev; + struct drm_property *prop; + + if (!connector->active_bpc_property) { + prop = drm_property_create_range(dev, DRM_MODE_PROP_IMMUTABLE, "active bpc", min, max); + if (!prop) + return -ENOMEM; + + connector->active_bpc_property = prop; + drm_object_attach_property(&connector->base, prop, 0); + } + + return 0; +} +EXPORT_SYMBOL(drm_connector_attach_active_bpc_property); + +/** + * drm_connector_set_active_bpc_property - sets the active bits per color property for a connector + * @connector: drm connector + * @active_bpc: bits per color for the connector currently active on "the cable" + * + * Should be used by atomic drivers to update the active bits per color over a connector. + */ +void drm_connector_set_active_bpc_property(struct drm_connector *connector, int active_bpc) +{ + drm_object_property_set_value(&connector->base, connector->active_bpc_property, active_bpc); +} +EXPORT_SYMBOL(drm_connector_set_active_bpc_property); + /** * drm_connector_attach_hdr_output_metadata_property - attach "HDR_OUTPUT_METADA" property * @connector: connector to attach the property on. diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 714d1a01c065..eee86de62a5f 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1380,6 +1380,12 @@ struct drm_connector { */ struct drm_property *max_bpc_property; + /** + * @active_bpc_property: Default connector property for the active bpc + * to be driven out of the connector. + */ + struct drm_property *active_bpc_property; + #define DRM_CONNECTOR_POLL_HPD (1 << 0) #define DRM_CONNECTOR_POLL_CONNECT (1 << 1) #define DRM_CONNECTOR_POLL_DISCONNECT (1 << 2) @@ -1702,6 +1708,8 @@ int drm_connector_set_panel_orientation_with_quirk( int width, int height); int drm_connector_attach_max_bpc_property(struct drm_connector *connector, int min, int max); +int drm_connector_attach_active_bpc_property(struct drm_connector *connector, int min, int max); +void drm_connector_set_active_bpc_property(struct drm_connector *connector, int active_bpc); /** * struct drm_tile_group - Tile group metadata
Add a new general drm property "active bpc" which can be used by graphic drivers to report the applied bit depth per pixel back to userspace. While "max bpc" can be used to change the color depth, there was no way to check which one actually got used. While in theory the driver chooses the best/highest color depth within the max bpc setting a user might not be fully aware what his hardware is or isn't capable off. This is meant as a quick way to double check the setup. In the future, automatic color calibration for screens might also depend on this information being available. Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> --- drivers/gpu/drm/drm_connector.c | 50 +++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 8 ++++++ 2 files changed, 58 insertions(+)