Commit f7af425d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200904115354.25336-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 637f7240

drivers/gpu/drm/i915/display/intel_ddi.c

+4 −6
Original line number Diff line number Diff line
@@ -3581,21 +3581,19 @@ 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);

	}

}

}



static void intel_disable_ddi_buf(struct intel_encoder *encoder,

				  const struct intel_crtc_state *crtc_state)

drivers/gpu/drm/i915/display/intel_display_types.h

+1 −0
Original line number Diff line number Diff line
@@ -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];

drivers/gpu/drm/i915/display/intel_dp.c

+6 −1
Original line number Diff line number Diff line
@@ -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;



	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;

}