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

Commit c867df70 authored by Adam Jackson's avatar Adam Jackson Committed by Dave Airlie
Browse files

drm/edid: Reshuffle mode list construction to closer match the spec 



Also, document what the spec says to do.

Signed-off-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 2b470ab0

drivers/gpu/drm/drm_edid.c

+16 −2
Original line number Diff line number Diff line
@@ -1377,10 +1377,24 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) 


	quirks = edid_get_quirks(edid);



	num_modes += add_established_modes(connector, edid);

	num_modes += add_standard_modes(connector, edid);

	/*

	 * EDID spec says modes should be preferred in this order:

	 * - preferred detailed mode

	 * - other detailed modes from base block

	 * - detailed modes from extension blocks

	 * - CVT 3-byte code modes

	 * - standard timing codes

	 * - established timing codes

	 * - modes inferred from GTF or CVT range information

	 *

	 * We don't quite implement this yet, but we're close.

	 *

	 * XXX order for additional mode types in extension blocks?

	 */

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

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

	num_modes += add_standard_modes(connector, edid);

	num_modes += add_established_modes(connector, edid);



	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))

		edid_fixup_preferred(connector, quirks);