This commit implements the "active bpc" drm property for the AMD GPU driver.

Signed-off-by: Werner Sembach <w...@tuxedocomputers.com>
---
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 19 ++++++++++++++++++-
 .../display/amdgpu_dm/amdgpu_dm_mst_types.c   |  4 ++++
 2 files changed, 22 insertions(+), 1 deletion(-)

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 cd1df5cf4815..f31bbcb11f03 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -7713,8 +7713,10 @@ void amdgpu_dm_connector_init_helper(struct 
amdgpu_display_manager *dm,
                                adev->mode_info.underscan_vborder_property,
                                0);
 
-       if (!aconnector->mst_port)
+       if (!aconnector->mst_port) {
                drm_connector_attach_max_bpc_property(&aconnector->base, 8, 16);
+               drm_connector_attach_active_bpc_property(&aconnector->base, 8, 
16);
+       }
 
        /* This defaults to the max in the range, but we want 8bpc for non-edp. 
*/
        aconnector->base.state->max_bpc = (connector_type == 
DRM_MODE_CONNECTOR_eDP) ? 16 : 8;
@@ -9083,6 +9085,21 @@ static void amdgpu_dm_atomic_commit_tail(struct 
drm_atomic_state *state)
                mutex_unlock(&dm->dc_lock);
        }
 
+       /* Extract information from crtc to communicate it to userspace as 
connector properties */
+       for_each_new_connector_in_state(state, connector, new_con_state, i) {
+               struct drm_crtc *crtc = new_con_state->crtc;
+               if (crtc) {
+                       new_crtc_state = drm_atomic_get_new_crtc_state(state, 
crtc);
+                       dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
+                       if (dm_new_crtc_state->stream)
+                               drm_connector_set_active_bpc_property(connector,
+                                       convert_dc_color_depth_into_bpc(
+                                       
dm_new_crtc_state->stream->timing.display_color_depth));
+               }
+               else
+                       drm_connector_set_active_bpc_property(connector, 0);
+       }
+
        /* Count number of newly disabled CRTCs for dropping PM refs later. */
        for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
                                      new_crtc_state, i) {
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 5568d4e518e6..0cf38743ec47 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
@@ -409,6 +409,10 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr 
*mgr,
        if (connector->max_bpc_property)
                drm_connector_attach_max_bpc_property(connector, 8, 16);
 
+       connector->active_bpc_property = master->base.active_bpc_property;
+       if (connector->active_bpc_property)
+               drm_connector_attach_active_bpc_property(&aconnector->base, 8, 
16);
+
        connector->vrr_capable_property = master->base.vrr_capable_property;
        if (connector->vrr_capable_property)
                drm_connector_attach_vrr_capable_property(connector);
-- 
2.25.1

Reply via email to