After driver init we shouldn't create new properties. Doing so will lead to a warning storm from __drm_mode_object_add.
We don't really need to create the property for MST connectors. Re-using the mst_root connector's property is fine. Signed-off-by: Harry Wentland <[email protected]> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 5722b14a6bec..ba493d325dcb 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7359,8 +7359,13 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, drm_connector_attach_colorspace_property(&aconnector->base); } else if (connector_type == DRM_MODE_CONNECTOR_DisplayPort || connector_type == DRM_MODE_CONNECTOR_eDP) { - if (!drm_mode_create_dp_colorspace_property(&aconnector->base, supported_colorspaces)) - drm_connector_attach_colorspace_property(&aconnector->base); + if (!aconnector->mst_root) + if (!drm_mode_create_dp_colorspace_property(&aconnector->base, supported_colorspaces)) + drm_connector_attach_colorspace_property(&aconnector->base); + else /* use root connector's property */ + if (aconnector->mst_root->base.colorspace_property) + drm_connector_attach_colorspace_property(&aconnector->mst_root->base); + } if (connector_type == DRM_MODE_CONNECTOR_HDMIA || -- 2.41.0
