Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 60652ebbdf61..18e4cba76720 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -539,7 +539,15 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
 
         intel_attach_force_audio_property(connector);
         intel_attach_broadcast_rgb_property(connector);
-        drm_connector_attach_max_bpc_property(connector, 6, 12);
+
+        /*
+         * Reuse the prop from the SST connector because we're
+         * not allowed to create new props after device registration.
+         */
+        connector->max_bpc_property =
+                intel_dp->attached_connector->base.max_bpc_property;
+        if (connector->max_bpc_property)
+                drm_connector_attach_max_bpc_property(connector, 6, 12);
 
         return connector;