Commit 7c1000aa authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/hdmi: stop caching has_hdmi_sink in struct intel_hdmi 



Use the information stored in display info.

Reviewed-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5cdb4731260b062c0f0ad2f8b64195c9a57bcb76.1685437500.git.jani.nikula@intel.com
parent 9fe2a4ad

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

+0 −1
Original line number Diff line number Diff line
@@ -1586,7 +1586,6 @@ struct intel_hdmi { 
		enum drm_dp_dual_mode_type type;

		int max_tmds_clock;

	} dp_dual_mode;

	bool has_hdmi_sink;

	struct intel_connector *attached_connector;

	struct cec_notifier *cec_notifier;

};

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

+3 −5
Original line number Diff line number Diff line
@@ -1790,7 +1790,9 @@ static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder) 
static bool intel_has_hdmi_sink(struct intel_hdmi *hdmi,

				const struct drm_connector_state *conn_state)

{

	return hdmi->has_hdmi_sink &&

	struct intel_connector *connector = hdmi->attached_connector;



	return connector->base.display_info.is_hdmi &&

		READ_ONCE(to_intel_digital_connector_state(conn_state)->force_audio) != HDMI_AUDIO_OFF_DVI;

}
@@ -2385,8 +2387,6 @@ intel_hdmi_unset_edid(struct drm_connector *connector) 
{

	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(to_intel_connector(connector));



	intel_hdmi->has_hdmi_sink = false;



	intel_hdmi->dp_dual_mode.type = DRM_DP_DUAL_MODE_NONE;

	intel_hdmi->dp_dual_mode.max_tmds_clock = 0;
@@ -2478,8 +2478,6 @@ intel_hdmi_set_edid(struct drm_connector *connector) 
	/* FIXME: Get rid of drm_edid_raw() */

	edid = drm_edid_raw(drm_edid);

	if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {

		intel_hdmi->has_hdmi_sink = drm_detect_hdmi_monitor(edid);



		intel_hdmi_dp_dual_mode_detect(connector);



		connected = true;