drm/i915: Don't add the "force audio" property to DP connectors that don't support...

No point in adding the "force audio" property to DP connectors
that don't support audio (g4x or port A).

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171129164303.18793-2-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 01c848b..bf93991 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5180,8 +5180,11 @@ static void
 intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connector)
 {
        struct drm_i915_private *dev_priv = to_i915(connector->dev);
+       enum port port = dp_to_dig_port(intel_dp)->base.port;
+
+       if (!IS_G4X(dev_priv) && port != PORT_A)
+               intel_attach_force_audio_property(connector);
 
-       intel_attach_force_audio_property(connector);
        intel_attach_broadcast_rgb_property(connector);
 
        if (intel_dp_is_edp(intel_dp)) {