Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d471ed04 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/drivers: drop redundant drm_edid_to_eld() calls 



drm_add_edid_modes() now fills in the ELD automatically, so the calls to
drm_edid_to_eld() are redundant. Remove them.

All the other places are obvious, but nv50 has detached
drm_edid_to_eld() from the drm_add_edid_modes() call.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Eric Anholt <eric@anholt.net>
Acked-by: default avatarEric Anholt <eric@anholt.net>
Acked-by: default avatarArchit Taneja <architt@codeaurora.org>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0959ca02b983afc9e74dd9acd190ba6e25f21678.1509545641.git.jani.nikula@intel.com
parent c945b8c1

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

+0 −1
Original line number Diff line number Diff line
@@ -358,7 +358,6 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) 
	if (amdgpu_connector->edid) {

		drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid);

		ret = drm_add_edid_modes(connector, amdgpu_connector->edid);

		drm_edid_to_eld(connector, amdgpu_connector->edid);

		return ret;

	}

	drm_mode_connector_update_edid_property(connector, NULL);

drivers/gpu/drm/bridge/analogix-anx78xx.c

+0 −2
Original line number Diff line number Diff line
@@ -977,8 +977,6 @@ static int anx78xx_get_modes(struct drm_connector *connector) 
	}



	num_modes = drm_add_edid_modes(connector, anx78xx->edid);

	/* Store the ELD */

	drm_edid_to_eld(connector, anx78xx->edid);



unlock:

	mutex_unlock(&anx78xx->lock);

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

+0 −2
Original line number Diff line number Diff line
@@ -1910,8 +1910,6 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector) 
		drm_mode_connector_update_edid_property(connector, edid);

		cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid);

		ret = drm_add_edid_modes(connector, edid);

		/* Store the ELD */

		drm_edid_to_eld(connector, edid);

		kfree(edid);

	} else {

		dev_dbg(hdmi->dev, "failed to get edid\n");

drivers/gpu/drm/i2c/tda998x_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -1100,7 +1100,6 @@ static int tda998x_connector_get_modes(struct drm_connector *connector) 


	drm_mode_connector_update_edid_property(connector, edid);

	n = drm_add_edid_modes(connector, edid);

	drm_edid_to_eld(connector, edid);



	kfree(edid);

drivers/gpu/drm/i915/intel_dp.c

+0 −1
Original line number Diff line number Diff line
@@ -5865,7 +5865,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, 
		if (drm_add_edid_modes(connector, edid)) {

			drm_mode_connector_update_edid_property(connector,

								edid);

			drm_edid_to_eld(connector, edid);

		} else {

			kfree(edid);

			edid = ERR_PTR(-EINVAL);