Commit 1bc73448 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/cec: switch to setting physical address directly 



Avoid parsing the EDID again for source physical address. Also gets rids
of a few remaining raw EDID usages.

Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: linux-media@vger.kernel.org
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Link: https://patchwork.freedesktop.org/patch/msgid/01a90c82c8a4f2fd945e0181ffeaca595928d19e.1692884619.git.jani.nikula@intel.com
parent 113cdddc

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

+2 −5
Original line number Diff line number Diff line
@@ -5201,7 +5201,6 @@ intel_dp_set_edid(struct intel_dp *intel_dp) 
	struct drm_i915_private *i915 = dp_to_i915(intel_dp);

	struct intel_connector *connector = intel_dp->attached_connector;

	const struct drm_edid *drm_edid;

	const struct edid *edid;

	bool vrr_capable;



	intel_dp_unset_edid(intel_dp);
@@ -5219,10 +5218,8 @@ intel_dp_set_edid(struct intel_dp *intel_dp) 
	intel_dp_update_dfp(intel_dp, drm_edid);

	intel_dp_update_420(intel_dp);



	/* FIXME: Get rid of drm_edid_raw() */

	edid = drm_edid_raw(drm_edid);



	drm_dp_cec_set_edid(&intel_dp->aux, edid);

	drm_dp_cec_attach(&intel_dp->aux,

			  connector->base.display_info.source_physical_address);

}



static void

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

+2 −3
Original line number Diff line number Diff line
@@ -2485,9 +2485,8 @@ intel_hdmi_set_edid(struct drm_connector *connector) 


	intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS, wakeref);



	/* FIXME: Get rid of drm_edid_raw() */

	cec_notifier_set_phys_addr_from_edid(intel_hdmi->cec_notifier,

					     drm_edid_raw(drm_edid));

	cec_notifier_set_phys_addr(intel_hdmi->cec_notifier,

				   connector->display_info.source_physical_address);



	return connected;

}