drm/edid: support Microsoft extension for HMDs and specialized monitors
Subsystems (2)
PATCH v2 1/2 drm/edid: support Microsoft extension for HMDs and specialized monitors
Add minimal support for parsing VSDBs documented in Microsoft's "EDID extension for head-mounted and specialized monitors" [1]. The version field and the desktop usage flag can be used to set the non_desktop connector property.
Tested with HPN-36C1 and LEN-B800.
---
Changes since v1 [2]:
- Split out quirk removal into a separate patch.
- Set non_desktop to true instead of 1.
[2] https://lore.kernel.org/all/[email protected]/
--- drivers/gpu/drm/drm_edid.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/gpu/drm/drm_edid.c +34 -0
@@ -93,6 +93,8 @@ static int oui(u8 first, u8 second, u8 third)/* Non desktop display (i.e. HMD) */ #define EDID_QUIRK_NON_DESKTOP (1 << 12) +#define MICROSOFT_IEEE_OUI 0xca125c +struct detailed_mode_closure {struct drm_connector *connector;struct edid *edid;
@@ -4222,6 +4224,17 @@ static bool cea_db_is_hdmi_forum_vsdb(const u8 *db)return oui (db[3 ], db[2 ], db[1 ]) ==HDMI_FORUM_IEEE_OUI ; } +static bool cea_db_is_microsoft_vsdb (const u8 *db) +{ +if (cea_db_tag (db) !=VENDOR_BLOCK ) +return false; + +if (cea_db_payload_len (db) !=21 ) +return false; + +return oui (db[3 ], db[2 ], db[1 ]) ==MICROSOFT_IEEE_OUI ; +} +static bool cea_db_is_vcdb (const u8 *db) {if (cea_db_tag (db) !=USE_EXTENDED_TAG )
@@ -5149,6 +5162,25 @@ drm_parse_hdmi_vsdb_video(struct drm_connector *connector, const u8 *db)drm_parse_hdmi_deep_color_info (connector, db); } +/* +* See EDID extension for head-mounted and specialized monitors, specified at: +* https://docs.microsoft.com/en-us/windows-hardware/drivers/display/specialized-monitors-edid-extension +*/ +static void drm_parse_microsoft_vsdb (struct drm_connector *connector, +const u8 *db) +{ +struct drm_display_info *info = &connector->display_info; +u8 version = db[4 ]; +bool desktop_usage = db[5 ] &BIT (6 ); + +/* Version 1 and 2 for HMDs, version 3 flags desktop usage explicitly */ +if (version ==1 || version ==2 || (version ==3 && !desktop_usage)) + info->non_desktop = true; + +drm_dbg_kms (connector->dev,"HMD or specialized display VSDB version %u: 0x%02x\n" , + version, db[5 ]); +} +static void drm_parse_cea_ext (struct drm_connector *connector,const struct edid *edid) {
@@ -5179,6 +5211,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,drm_parse_hdmi_vsdb_video (connector, db);if (cea_db_is_hdmi_forum_vsdb (db))drm_parse_hdmi_forum_vsdb (connector, db); +if (cea_db_is_microsoft_vsdb (db)) +drm_parse_microsoft_vsdb (connector, db);if (cea_db_is_y420cmdb (db))drm_parse_y420cmdb_bitmap (connector, db);if (cea_db_is_vcdb (db))
base-commit: e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
Signature · 1 line
2.34.1
PATCH v2 2/2 drm/edid: remove non_desktop quirk for HPN-3515 and LEN-B800.
Now that there is support for the Microsoft VSDB for HMDs, remove the non-desktop quirk for two devices that are verified to contain it in their EDID: HPN-3515 and LEN-B800.
Presumably most of the other Windows Mixed Reality headsets contain it as well, but there are ACR-7FCE and SEC-5194 devices without it.
Tested with LEN-B800.
---
Changes since v1 [1]:
- Quirk removal split out of patch 1.
[1] https://lore.kernel.org/all/[email protected]/
--- drivers/gpu/drm/drm_edid.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -2
@@ -214,9 +214,7 @@ static const struct edid_quirk {/* Windows Mixed Reality Headsets */ EDID_QUIRK ('A' ,'C' ,'R' ,0x7fce ,EDID_QUIRK_NON_DESKTOP ), -EDID_QUIRK ('H' ,'P' ,'N' ,0x3515 ,EDID_QUIRK_NON_DESKTOP ),EDID_QUIRK ('L' ,'E' ,'N' ,0x0408 ,EDID_QUIRK_NON_DESKTOP ), -EDID_QUIRK ('L' ,'E' ,'N' ,0xb800 ,EDID_QUIRK_NON_DESKTOP ),EDID_QUIRK ('F' ,'U' ,'J' ,0x1970 ,EDID_QUIRK_NON_DESKTOP ),EDID_QUIRK ('D' ,'E' ,'L' ,0x7fce ,EDID_QUIRK_NON_DESKTOP ), EDID_QUIRK('S', 'E', 'C', 0x144a, EDID_QUIRK_NON_DESKTOP),
Signature · 1 line
2.34.1
Quoted 11 lines · Philipp Zabel
Add minimal support for parsing VSDBs documented in Microsoft's "EDID extension for head-mounted and specialized monitors" [1]. The version field and the desktop usage flag can be used to set the
non_desktopconnector property.Tested with HPN-36C1 and LEN-B800.
Signed-off-by Philipp Zabel <[email protected]>Reviewed-by Jani Nikula <[email protected]>
Thanks for the patches, both pushed to drm-misc-next.
BR,
Jani.
Quoted 78 lines
---
Changes since v1 [2]:
- Split out quirk removal into a separate patch.
- Setnon_desktopto true instead of 1.[2] https://lore.kernel.org/all/[email protected]/
--- drivers/gpu/drm/drm_edid.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)drivers/gpu/drm/drm_edid.c +34
-0@@ -93,6 +93,8 @@ static int oui(u8 first, u8 second, u8 third)/* Non desktop display (i.e. HMD) */ #define EDID_QUIRK_NON_DESKTOP (1 << 12) +#define MICROSOFT_IEEE_OUI 0xca125c +struct detailed_mode_closure {struct drm_connector *connector;struct edid *edid;@@ -4222,6 +4224,17 @@ static bool cea_db_is_hdmi_forum_vsdb(const u8 *db)return oui (db[3 ], db[2 ], db[1 ]) ==HDMI_FORUM_IEEE_OUI ; } +static bool cea_db_is_microsoft_vsdb (const u8 *db) +{ +if (cea_db_tag (db) !=VENDOR_BLOCK ) +return false; + +if (cea_db_payload_len (db) !=21 ) +return false; + +return oui (db[3 ], db[2 ], db[1 ]) ==MICROSOFT_IEEE_OUI ; +} +static bool cea_db_is_vcdb (const u8 *db) {if (cea_db_tag (db) !=USE_EXTENDED_TAG )@@ -5149,6 +5162,25 @@ drm_parse_hdmi_vsdb_video(struct drm_connector *connector, const u8 *db)drm_parse_hdmi_deep_color_info (connector, db); } +/* +* See EDID extension for head-mounted and specialized monitors, specified at: +* https://docs.microsoft.com/en-us/windows-hardware/drivers/display/specialized-monitors-edid-extension +*/ +static void drm_parse_microsoft_vsdb (struct drm_connector *connector, +const u8 *db) +{ +struct drm_display_info *info = &connector->display_info; +u8 version = db[4 ]; +bool desktop_usage = db[5 ] &BIT (6 ); + +/* Version 1 and 2 for HMDs, version 3 flags desktop usage explicitly */ +if (version ==1 || version ==2 || (version ==3 && !desktop_usage)) + info->non_desktop = true; + +drm_dbg_kms (connector->dev,"HMD or specialized display VSDB version %u: 0x%02x\n" , + version, db[5 ]); +} +static void drm_parse_cea_ext (struct drm_connector *connector,const struct edid *edid) {@@ -5179,6 +5211,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,drm_parse_hdmi_vsdb_video (connector, db);if (cea_db_is_hdmi_forum_vsdb (db))drm_parse_hdmi_forum_vsdb (connector, db); +if (cea_db_is_microsoft_vsdb (db)) +drm_parse_microsoft_vsdb (connector, db);if (cea_db_is_y420cmdb (db))drm_parse_y420cmdb_bitmap (connector, db);if (cea_db_is_vcdb (db))base-commit:
e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center