Commit 40f71f5b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/edid: convert drm_edid_connector_update() to drm_edid fully 



We'll need to propagate drm_edid everywhere.

v3: s/edid/drm_edid/ in comment too (Ankit)

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220511092650.4193330-1-jani.nikula@intel.com
parent a2f9790d

drivers/gpu/drm/drm_edid.c

+47 −50
Original line number Diff line number Diff line
@@ -3253,16 +3253,16 @@ do_inferred_modes(const struct detailed_timing *timing, void *c) 
	}

}



static int

add_inferred_modes(struct drm_connector *connector, const struct edid *edid)

static int add_inferred_modes(struct drm_connector *connector,

			      const struct drm_edid *drm_edid)

{

	struct detailed_mode_closure closure = {

		.connector = connector,

		.edid = edid,

		.edid = drm_edid->edid,

	};



	if (version_greater(edid, 1, 0))

		drm_for_each_detailed_block(edid, do_inferred_modes, &closure);

	if (version_greater(drm_edid->edid, 1, 0))

		drm_for_each_detailed_block(drm_edid->edid, do_inferred_modes, &closure);



	return closure.modes;

}
@@ -3312,10 +3312,11 @@ do_established_modes(const struct detailed_timing *timing, void *c) 
 * bitmap of the supported "established modes" list (defined above). Tease them

 * out and add them to the global modes list.

 */

static int

add_established_modes(struct drm_connector *connector, const struct edid *edid)

static int add_established_modes(struct drm_connector *connector,

				 const struct drm_edid *drm_edid)

{

	struct drm_device *dev = connector->dev;

	const struct edid *edid = drm_edid->edid;

	unsigned long est_bits = edid->established_timings.t1 |

		(edid->established_timings.t2 << 8) |

		((edid->established_timings.mfg_rsvd & 0x80) << 9);
@@ -3338,7 +3339,7 @@ add_established_modes(struct drm_connector *connector, const struct edid *edid) 
	}



	if (version_greater(edid, 1, 0))

		drm_for_each_detailed_block(edid, do_established_modes,

		drm_for_each_detailed_block(drm_edid->edid, do_established_modes,

					    &closure);



	return modes + closure.modes;
@@ -3373,28 +3374,28 @@ do_standard_modes(const struct detailed_timing *timing, void *c) 
 * using the appropriate standard (DMT, GTF, or CVT). Grab them from EDID and

 * add them to the list.

 */

static int

add_standard_modes(struct drm_connector *connector, const struct edid *edid)

static int add_standard_modes(struct drm_connector *connector,

			      const struct drm_edid *drm_edid)

{

	int i, modes = 0;

	struct detailed_mode_closure closure = {

		.connector = connector,

		.edid = edid,

		.edid = drm_edid->edid,

	};



	for (i = 0; i < EDID_STD_TIMINGS; i++) {

		struct drm_display_mode *newmode;



		newmode = drm_mode_std(connector, edid,

				       &edid->standard_timings[i]);

		newmode = drm_mode_std(connector, drm_edid->edid,

				       &drm_edid->edid->standard_timings[i]);

		if (newmode) {

			drm_mode_probed_add(connector, newmode);

			modes++;

		}

	}



	if (version_greater(edid, 1, 0))

		drm_for_each_detailed_block(edid, do_standard_modes,

	if (version_greater(drm_edid->edid, 1, 0))

		drm_for_each_detailed_block(drm_edid->edid, do_standard_modes,

					    &closure);



	/* XXX should also look for standard codes in VTB blocks */
@@ -3466,15 +3467,15 @@ do_cvt_mode(const struct detailed_timing *timing, void *c) 
}



static int

add_cvt_modes(struct drm_connector *connector, const struct edid *edid)

add_cvt_modes(struct drm_connector *connector, const struct drm_edid *drm_edid)

{

	struct detailed_mode_closure closure = {

		.connector = connector,

		.edid = edid,

		.edid = drm_edid->edid,

	};



	if (version_greater(edid, 1, 2))

		drm_for_each_detailed_block(edid, do_cvt_mode, &closure);

	if (version_greater(drm_edid->edid, 1, 2))

		drm_for_each_detailed_block(drm_edid->edid, do_cvt_mode, &closure);



	/* XXX should also look for CVT codes in VTB blocks */
@@ -3516,25 +3517,24 @@ do_detailed_mode(const struct detailed_timing *timing, void *c) 
/*

 * add_detailed_modes - Add modes from detailed timings

 * @connector: attached connector

 * @edid: EDID block to scan

 * @drm_edid: EDID block to scan

 * @quirks: quirks to apply

 */

static int

add_detailed_modes(struct drm_connector *connector, const struct edid *edid,

		   u32 quirks)

static int add_detailed_modes(struct drm_connector *connector,

			      const struct drm_edid *drm_edid, u32 quirks)

{

	struct detailed_mode_closure closure = {

		.connector = connector,

		.edid = edid,

		.edid = drm_edid->edid,

		.preferred = true,

		.quirks = quirks,

	};



	if (closure.preferred && !version_greater(edid, 1, 3))

	if (closure.preferred && !version_greater(drm_edid->edid, 1, 3))

		closure.preferred =

		    (edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING);

		    (drm_edid->edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING);



	drm_for_each_detailed_block(edid, do_detailed_mode, &closure);

	drm_for_each_detailed_block(drm_edid->edid, do_detailed_mode, &closure);



	return closure.modes;

}
@@ -3588,7 +3588,7 @@ const u8 *drm_find_edid_extension(const struct edid *edid, 
}



/* Return true if the EDID has a CTA extension or a DisplayID CTA data block */

static bool drm_edid_has_cta_extension(const struct edid *edid)

static bool drm_edid_has_cta_extension(const struct drm_edid *drm_edid)

{

	const struct displayid_block *block;

	struct displayid_iter iter;
@@ -3596,11 +3596,11 @@ static bool drm_edid_has_cta_extension(const struct edid *edid) 
	bool found = false;



	/* Look for a top level CEA extension block */

	if (drm_find_edid_extension(edid, CEA_EXT, &ext_index))

	if (drm_find_edid_extension(drm_edid->edid, CEA_EXT, &ext_index))

		return true;



	/* CEA blocks can also be found embedded in a DisplayID block */

	displayid_iter_edid_begin(edid, &iter);

	displayid_iter_edid_begin(drm_edid->edid, &iter);

	displayid_iter_for_each(block, &iter) {

		if (block->tag == DATA_BLOCK_CTA) {

			found = true;
@@ -3874,8 +3874,8 @@ static bool drm_valid_hdmi_vic(u8 vic) 
	return vic > 0 && vic < ARRAY_SIZE(edid_4k_modes);

}



static int

add_alternate_cea_modes(struct drm_connector *connector, const struct edid *edid)

static int add_alternate_cea_modes(struct drm_connector *connector,

				   const struct drm_edid *drm_edid)

{

	struct drm_device *dev = connector->dev;

	struct drm_display_mode *mode, *tmp;
@@ -3883,7 +3883,7 @@ add_alternate_cea_modes(struct drm_connector *connector, const struct edid *edid 
	int modes = 0;



	/* Don't add CTA modes if the CTA extension block is missing */

	if (!drm_edid_has_cta_extension(edid))

	if (!drm_edid_has_cta_extension(drm_edid))

		return 0;



	/*
@@ -4666,14 +4666,14 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector, 
	hdmi->y420_cmdb_map = map;

}



static int

add_cea_modes(struct drm_connector *connector, const struct edid *edid)

static int add_cea_modes(struct drm_connector *connector,

			 const struct drm_edid *drm_edid)

{

	const struct cea_db *db;

	struct cea_db_iter iter;

	int modes = 0;



	cea_db_iter_edid_begin(edid, &iter);

	cea_db_iter_edid_begin(drm_edid->edid, &iter);

	cea_db_iter_for_each(db, &iter) {

		const u8 *hdmi = NULL, *video = NULL;

		u8 hdmi_len = 0, video_len = 0;
@@ -5824,13 +5824,13 @@ static int add_displayid_detailed_1_modes(struct drm_connector *connector, 
}



static int add_displayid_detailed_modes(struct drm_connector *connector,

					const struct edid *edid)

					const struct drm_edid *drm_edid)

{

	const struct displayid_block *block;

	struct displayid_iter iter;

	int num_modes = 0;



	displayid_iter_edid_begin(edid, &iter);

	displayid_iter_edid_begin(drm_edid->edid, &iter);

	displayid_iter_for_each(block, &iter) {

		if (block->tag == DATA_BLOCK_TYPE_1_DETAILED_TIMING ||

		    block->tag == DATA_BLOCK_2_TYPE_7_DETAILED_TIMING)
@@ -5844,7 +5844,6 @@ static int add_displayid_detailed_modes(struct drm_connector *connector, 
static int drm_edid_connector_update(struct drm_connector *connector,

				     const struct drm_edid *drm_edid)

{

	const struct edid *edid;

	int num_modes = 0;

	u32 quirks;
@@ -5854,8 +5853,6 @@ static int drm_edid_connector_update(struct drm_connector *connector, 
		return 0;

	}



	edid = drm_edid->edid;



	/*

	 * CEA-861-F adds ycbcr capability map block, for HDMI 2.0 sinks.

	 * To avoid multiple parsing of same block, lets parse that map
@@ -5880,15 +5877,15 @@ static int drm_edid_connector_update(struct drm_connector *connector, 
	 *

	 * XXX order for additional mode types in extension blocks?

	 */

	num_modes += add_detailed_modes(connector, edid, quirks);

	num_modes += add_cvt_modes(connector, edid);

	num_modes += add_standard_modes(connector, edid);

	num_modes += add_established_modes(connector, edid);

	num_modes += add_cea_modes(connector, edid);

	num_modes += add_alternate_cea_modes(connector, edid);

	num_modes += add_displayid_detailed_modes(connector, edid);

	if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)

		num_modes += add_inferred_modes(connector, edid);

	num_modes += add_detailed_modes(connector, drm_edid, quirks);

	num_modes += add_cvt_modes(connector, drm_edid);

	num_modes += add_standard_modes(connector, drm_edid);

	num_modes += add_established_modes(connector, drm_edid);

	num_modes += add_cea_modes(connector, drm_edid);

	num_modes += add_alternate_cea_modes(connector, drm_edid);

	num_modes += add_displayid_detailed_modes(connector, drm_edid);

	if (drm_edid->edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)

		num_modes += add_inferred_modes(connector, drm_edid);



	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))

		edid_fixup_preferred(connector, quirks);