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

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

FIXME: How do we turn off infoframes once enabled? Do we even
       have to?

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200904115354.25336-3-ville.syrjala@linux.intel.com
Reviewed-by: Lyude Paul <lyude@redhat.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index a73534d0a6423a65fba3261c99320d58c429d636..1eb9191e49dd2aa833a323dfd9b18a1b92685046 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3581,19 +3581,17 @@ static void intel_ddi_pre_enable(struct intel_atomic_state *state,
                intel_ddi_pre_enable_hdmi(state, encoder, crtc_state,
                                          conn_state);
        } else {
-               struct intel_lspcon *lspcon =
-                               enc_to_intel_lspcon(encoder);
+               struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
 
                intel_ddi_pre_enable_dp(state, encoder, crtc_state,
                                        conn_state);
-               if (lspcon->active) {
-                       struct intel_digital_port *dig_port =
-                                       enc_to_dig_port(encoder);
 
+               /* FIXME precompute everything properly */
+               /* FIXME how do we turn infoframes off again? */
+               if (dig_port->lspcon.active && dig_port->dp.has_hdmi_sink)
                        dig_port->set_infoframes(encoder,
                                                 crtc_state->has_infoframe,
                                                 crtc_state, conn_state);
-               }
        }
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index b2d0edacc58c9b03ab4903b7c3613a41617400d2..bd51855ddc842f87f7faf3ec2b1348a0f1ad0e5e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1279,6 +1279,7 @@ struct intel_dp {
        u8 sink_count;
        bool link_mst;
        bool link_trained;
+       bool has_hdmi_sink;
        bool has_audio;
        bool reset_link_params;
        u8 dpcd[DP_RECEIVER_CAP_SIZE];

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 4bd10456ad1881318b36e67eec73a19f13a2e18b..684166dbc9a337d6f80277edc435c1d43060ce53 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -6069,7 +6069,11 @@ intel_dp_set_edid(struct intel_dp *intel_dp)
        edid = intel_dp_get_edid(intel_dp);
        intel_connector->detect_edid = edid;
 
-       intel_dp->has_audio = drm_detect_monitor_audio(edid);
+       if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {
+               intel_dp->has_hdmi_sink = drm_detect_hdmi_monitor(edid);
+               intel_dp->has_audio = drm_detect_monitor_audio(edid);
+       }
+
        drm_dp_cec_set_edid(&intel_dp->aux, edid);
        intel_dp->edid_quirks = drm_dp_get_edid_quirks(edid);
 }
@@ -6083,6 +6087,7 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
        kfree(intel_connector->detect_edid);
        intel_connector->detect_edid = NULL;
 
+       intel_dp->has_hdmi_sink = false;
        intel_dp->has_audio = false;
        intel_dp->edid_quirks = 0;
 }