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

Commit 0e8578c9 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449782037-19722-2-git-send-email-ville.syrjala@linux.intel.com
parent d0b41421

drivers/gpu/drm/drm_probe_helper.c

+8 −9
Original line number Diff line number Diff line
@@ -233,17 +233,16 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, 
		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);

	}