drm/i915: utilize subconnector property for DP

Since DP-specific information is stored in driver's structures, every
driver needs to implement subconnector property by itself.

v2: updates to match previous commit changes

v3: rebase

v4: renamed a function call

Cc: Ville Syrjälä <[email protected]>
Cc: [email protected]
Signed-off-by: Jeevan B <[email protected]>
Signed-off-by: Oleg Vasilev <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> #and acked for merging
Tested-by: Oleg Vasilev <[email protected]>
Signed-off-by: Maarten Lankhorst <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index cc525fda441af8ea8da7e361686838dc8db08954..f2c6d835a12fa57446d4a0a98603b6bbccd827c5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -6256,6 +6256,11 @@ out:
         */
        intel_display_power_flush_work(dev_priv);
 
+       if (!intel_dp_is_edp(intel_dp))
+               drm_dp_set_subconnector_property(connector,
+                                                status,
+                                                intel_dp->dpcd,
+                                                intel_dp->downstream_ports);
        return status;
 }
 
@@ -7350,6 +7355,9 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect
        struct drm_i915_private *dev_priv = to_i915(connector->dev);
        enum port port = dp_to_dig_port(intel_dp)->base.port;
 
+       if (!intel_dp_is_edp(intel_dp))
+               drm_connector_attach_dp_subconnector_property(connector);
+
        if (!IS_G4X(dev_priv) && port != PORT_A)
                intel_attach_force_audio_property(connector);