From: jsg <jsg@openbsd.org>
Date: Sat, 15 Jun 2024 04:13:19 +0000 (+0000)
Subject: drm/edid: Parse topology block for all DispID structure v1.x
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e473a312f22ac9134ae6c3b007097b4aa0fa4c81;p=openbsd

drm/edid: Parse topology block for all DispID structure v1.x

From Ville Syrjala
6040fcea46055159c5cafc95cd6f63e06028086b in linux-6.6.y/6.6.33
e0a200ab4b72afd581bd6f82fc1ef510a4fb5478 in mainline linux
---

diff --git a/sys/dev/pci/drm/drm_edid.c b/sys/dev/pci/drm/drm_edid.c
index ba92bd045bd..d1949702215 100644
--- a/sys/dev/pci/drm/drm_edid.c
+++ b/sys/dev/pci/drm/drm_edid.c
@@ -7365,7 +7365,7 @@ static void drm_parse_tiled_block(struct drm_connector *connector,
 static bool displayid_is_tiled_block(const struct displayid_iter *iter,
 				     const struct displayid_block *block)
 {
-	return (displayid_version(iter) == DISPLAY_ID_STRUCTURE_VER_12 &&
+	return (displayid_version(iter) < DISPLAY_ID_STRUCTURE_VER_20 &&
 		block->tag == DATA_BLOCK_TILED_DISPLAY) ||
 		(displayid_version(iter) == DISPLAY_ID_STRUCTURE_VER_20 &&
 		 block->tag == DATA_BLOCK_2_TILED_DISPLAY_TOPOLOGY);
diff --git a/sys/dev/pci/drm/include/drm/drm_displayid.h b/sys/dev/pci/drm/include/drm/drm_displayid.h
index 566497eeb3b..bc1f6b37819 100644
--- a/sys/dev/pci/drm/include/drm/drm_displayid.h
+++ b/sys/dev/pci/drm/include/drm/drm_displayid.h
@@ -30,7 +30,6 @@ struct drm_edid;
 #define VESA_IEEE_OUI				0x3a0292
 
 /* DisplayID Structure versions */
-#define DISPLAY_ID_STRUCTURE_VER_12		0x12
 #define DISPLAY_ID_STRUCTURE_VER_20		0x20
 
 /* DisplayID Structure v1r2 Data Blocks */