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

Commit 29a60266 authored by Jani Nikula's avatar Jani Nikula Committed by Greg Kroah-Hartman
Browse files

drm/edid: abstract override/firmware EDID retrieval 



commit 56a2b7f2a39a8d4b16a628e113decde3d7400879 upstream.

Abstract the debugfs override and the firmware EDID retrieval
function. We'll be needing it in the follow-up. No functional changes.

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Harish Chegondi <harish.chegondi@intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: default avatarTested-by: Paul Wise <pabs3@bonedaddy.net>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190607110513.12072-1-jani.nikula@intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e93ce57f

drivers/gpu/drm/drm_edid.c

+17 −8
Original line number Diff line number Diff line
@@ -1580,6 +1580,20 @@ static void connector_bad_edid(struct drm_connector *connector, 
	}

}



/* Get override or firmware EDID */

static struct edid *drm_get_override_edid(struct drm_connector *connector)

{

	struct edid *override = NULL;



	if (connector->override_edid)

		override = drm_edid_duplicate(connector->edid_blob_ptr->data);



	if (!override)

		override = drm_load_edid_firmware(connector);



	return IS_ERR(override) ? NULL : override;

}



/**

 * drm_do_get_edid - get EDID data using a custom EDID block read function

 * @connector: connector we're probing
@@ -1607,15 +1621,10 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, 
{

	int i, j = 0, valid_extensions = 0;

	u8 *edid, *new;

	struct edid *override = NULL;



	if (connector->override_edid)

		override = drm_edid_duplicate(connector->edid_blob_ptr->data);



	if (!override)

		override = drm_load_edid_firmware(connector);

	struct edid *override;



	if (!IS_ERR_OR_NULL(override))

	override = drm_get_override_edid(connector);

	if (override)

		return override;



	if ((edid = kmalloc(EDID_LENGTH, GFP_KERNEL)) == NULL)