diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-06-15 04:13:20 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-06-15 04:13:20 +0000 |
| commit | c47a7f6026d532eb35f4f1f9b8ed35ebf0958c6c (patch) | |
| tree | 3f9d5d7c6f7f601d52eaec164901673e2a790b3a | |
| parent | 0cb6adcb38e59986abb661b1da8a2b676c448e30 (diff) | |
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
| -rw-r--r-- | sys/dev/pci/drm/drm_edid.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/include/drm/drm_displayid.h | 1 |
2 files changed, 1 insertions, 2 deletions
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 */ |