Commit 02b5c470 authored Dec 10, 2015 by Ville Syrjälä Committed by Tanmay Shah Jul 24, 2019

drm: Allow override_edid to override the firmware EDID



IMO the override_edid should override any default EDID for the
connector, whether that came in via the connector helper ->get_modes()
vfunc or via the firmware EDID mechanism.

Cc: Thomas Wood <thomas.wood@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.kernel.org/patch/7822361/
Git-Commit: 0e8578c996a33c8da9c28f8ed2d1be68694070ee
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Change-Id: I247c19010434473c9af9e0bb8cdeed6b335e4714
Signed-off-by: Tanmay Shah <tanmay@codeaurora.org>

parent 961798b1

drivers/gpu/drm/drm_probe_helper.c

+8 −9

Original line number	Diff line number	Diff line
		@@ -199,17 +199,16 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect
		goto prune;
		}

		#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
		count = drm_load_edid_firmware(connector);
		if (count == 0)
		#endif
		{
		if (connector->override_edid) {
		struct edid edid = (struct edid ) connector->edid_blob_ptr->data;

		count = drm_add_edid_modes(connector, edid);
		drm_edid_to_eld(connector, edid);
		} else
		} else {
		#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
		count = drm_load_edid_firmware(connector);
		if (count == 0)
		#endif
		count = (*connector_funcs->get_modes)(connector);
		}