summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_edid.c
diff options
context:
space:
mode:
authorLubosz Sarnecki <lubosz.sarnecki@collabora.com>2018-05-29 13:52:15 +0200
committerDaniel Stone <daniels@collabora.com>2018-06-02 09:46:49 +0100
commit6931317c714885f2d792e8150ef6715d416ac681 (patch)
tree97e7f26e25a43308fb38d4abcbfed215b081cccc /drivers/gpu/drm/drm_edid.c
parent09ea0dfbf972c63dfea8cf46f2fb67f39e4d833b (diff)
downloadtalos-obmc-linux-6931317c714885f2d792e8150ef6715d416ac681.tar.gz
talos-obmc-linux-6931317c714885f2d792e8150ef6715d416ac681.zip
drm/edid: Quirk Vive Pro VR headset non-desktop.
This adds the Vive Pro's EDID information and sets EDID_QUIRK_NON_DESKTOP. Signed-off-by: Lubosz Sarnecki <lubosz.sarnecki@collabora.com> Signed-off-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Daniel Stone <daniels@collabora.com> Cc: <stable@vger.kernel.org> # v4.15+ Link: https://patchwork.freedesktop.org/patch/msgid/20180529115215.4526-1-lubosz.sarnecki@collabora.com
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
-rw-r--r--drivers/gpu/drm/drm_edid.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 634a68a03b07..87654b8b279c 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -163,8 +163,9 @@ static const struct edid_quirk {
/* Rotel RSX-1058 forwards sink's EDID but only does HDMI 1.1*/
{ "ETR", 13896, EDID_QUIRK_FORCE_8BPC },
- /* HTC Vive VR Headset */
+ /* HTC Vive and Vive Pro VR Headsets */
{ "HVR", 0xaa01, EDID_QUIRK_NON_DESKTOP },
+ { "HVR", 0xaa02, EDID_QUIRK_NON_DESKTOP },
/* Oculus Rift DK1, DK2, and CV1 VR Headsets */
{ "OVR", 0x0001, EDID_QUIRK_NON_DESKTOP },
OpenPOWER on IntegriCloud