| Message ID | 20210630151018.330354-18-wse@tuxedocomputers.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | New uAPI drm properties for color management | expand |
Am 30.06.21 um 17:10 schrieb Werner Sembach: > This commit implements the "Broadcast RGB" drm property for the AMD GPU > driver. > > Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +++++++++++--- > .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++++ > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index 02a5809d4993..80d5a11fb0c5 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -5247,7 +5247,8 @@ get_aspect_ratio(const struct drm_display_mode *mode_in) > } > > static enum dc_color_space > -get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing) > +get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing, > + enum drm_mode_color_range preferred_color_range) > { > enum dc_color_space color_space = COLOR_SPACE_SRGB; > > @@ -5278,7 +5279,10 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing) > } > break; > case PIXEL_ENCODING_RGB: > - color_space = COLOR_SPACE_SRGB; > + if (preferred_color_range == DRM_MODE_COLOR_RANGE_LIMITED_16_235) > + color_space = COLOR_SPACE_SRGB_LIMITED; > + else > + color_space = COLOR_SPACE_SRGB; > break; After some testing I found out, that what I did here, was useless. amdgpu actually never sets the quantization_range range in the hdmi_avi_infoframe and from that I guess any quantization range, besides the default one, is not implemented in multiple places Until limited RGB is properly implemented in amdgpu there kind of is no purpose of generalizing the Broadcast RGB switch. > > default: > @@ -5424,7 +5428,10 @@ static void fill_stream_properties_from_drm_display_mode( > > timing_out->aspect_ratio = get_aspect_ratio(mode_in); > > - stream->output_color_space = get_output_color_space(timing_out); > + stream->output_color_space = get_output_color_space(timing_out, > + connector_state ? > + connector_state->preferred_color_range : > + DRM_MODE_COLOR_RANGE_UNSET); > > stream->out_transfer_func->type = TF_TYPE_PREDEFINED; > stream->out_transfer_func->tf = TRANSFER_FUNCTION_SRGB; > @@ -7775,6 +7782,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, > drm_connector_attach_active_bpc_property(&aconnector->base, 8, 16); > drm_connector_attach_preferred_color_format_property(&aconnector->base); > drm_connector_attach_active_color_format_property(&aconnector->base); > + drm_connector_attach_preferred_color_range_property(&aconnector->base); > drm_connector_attach_active_color_range_property(&aconnector->base); > } > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > index 2563788ba95a..80e1389fd0ec 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > @@ -421,6 +421,10 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, > if (connector->active_color_format_property) > drm_connector_attach_active_color_format_property(&aconnector->base); > > + connector->preferred_color_range_property = master->base.preferred_color_range_property; > + if (connector->preferred_color_range_property) > + drm_connector_attach_preferred_color_range_property(&aconnector->base); > + > connector->active_color_range_property = master->base.active_color_range_property; > if (connector->active_color_range_property) > drm_connector_attach_active_color_range_property(&aconnector->base);
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 02a5809d4993..80d5a11fb0c5 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5247,7 +5247,8 @@ get_aspect_ratio(const struct drm_display_mode *mode_in) } static enum dc_color_space -get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing) +get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing, + enum drm_mode_color_range preferred_color_range) { enum dc_color_space color_space = COLOR_SPACE_SRGB; @@ -5278,7 +5279,10 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing) } break; case PIXEL_ENCODING_RGB: - color_space = COLOR_SPACE_SRGB; + if (preferred_color_range == DRM_MODE_COLOR_RANGE_LIMITED_16_235) + color_space = COLOR_SPACE_SRGB_LIMITED; + else + color_space = COLOR_SPACE_SRGB; break; default: @@ -5424,7 +5428,10 @@ static void fill_stream_properties_from_drm_display_mode( timing_out->aspect_ratio = get_aspect_ratio(mode_in); - stream->output_color_space = get_output_color_space(timing_out); + stream->output_color_space = get_output_color_space(timing_out, + connector_state ? + connector_state->preferred_color_range : + DRM_MODE_COLOR_RANGE_UNSET); stream->out_transfer_func->type = TF_TYPE_PREDEFINED; stream->out_transfer_func->tf = TRANSFER_FUNCTION_SRGB; @@ -7775,6 +7782,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, drm_connector_attach_active_bpc_property(&aconnector->base, 8, 16); drm_connector_attach_preferred_color_format_property(&aconnector->base); drm_connector_attach_active_color_format_property(&aconnector->base); + drm_connector_attach_preferred_color_range_property(&aconnector->base); drm_connector_attach_active_color_range_property(&aconnector->base); } diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 2563788ba95a..80e1389fd0ec 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -421,6 +421,10 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, if (connector->active_color_format_property) drm_connector_attach_active_color_format_property(&aconnector->base); + connector->preferred_color_range_property = master->base.preferred_color_range_property; + if (connector->preferred_color_range_property) + drm_connector_attach_preferred_color_range_property(&aconnector->base); + connector->active_color_range_property = master->base.active_color_range_property; if (connector->active_color_range_property) drm_connector_attach_active_color_range_property(&aconnector->base);
This commit implements the "Broadcast RGB" drm property for the AMD GPU driver. Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +++++++++++--- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++++ 2 files changed, 15 insertions(+), 3 deletions(-)