drm/i915/lspcon: Do not send DRM infoframes to non-HDMI sinks

Non-HDMI sinks shouldn't be sent Dynamic Range and Mastering infoframes.
Check for that when using LSPCON.

v2: Addressed Ville's review comment.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201130204738.2443-15-uma.shankar@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 48da5dc59939ec4b344ad010fd4c7e7e83e3c05e..76e975b4765bba39f265d23b0745576adeb6ee11 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4118,6 +4118,7 @@ static void intel_enable_ddi_dp(struct intel_atomic_state *state,
 {
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
        struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
+       struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
        enum port port = encoder->port;
 
        if (port == PORT_A && INTEL_GEN(dev_priv) < 9)
@@ -4125,7 +4126,10 @@ static void intel_enable_ddi_dp(struct intel_atomic_state *state,
 
        intel_edp_backlight_on(crtc_state, conn_state);
        intel_psr_enable(intel_dp, crtc_state, conn_state);
-       intel_dp_set_infoframes(encoder, true, crtc_state, conn_state);
+
+       if (!dig_port->lspcon.active || dig_port->dp.has_hdmi_sink)
+               intel_dp_set_infoframes(encoder, true, crtc_state, conn_state);
+
        intel_edp_drrs_enable(intel_dp, crtc_state);
 
        if (crtc_state->has_audio)