Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux.git] / drivers / gpu / drm / drm_edid.c

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index fa39592ebc0afcd78435927f7cf552b638306233..649cfd8b42007cff821c2a39cca6dba391ca481c 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -68,8 +68,6 @@
  * maximum size and use that.
  */
 #define EDID_QUIRK_DETAILED_USE_MAXIMUM_SIZE   (1 << 4)
-/* Monitor forgot to set the first detailed is preferred bit. */
-#define EDID_QUIRK_FIRST_DETAILED_PREFERRED    (1 << 5)
 /* use +hsync +vsync for detailed mode */
 #define EDID_QUIRK_DETAILED_SYNC_PP            (1 << 6)
 /* Force reduced-blanking timings for detailed modes */
@@ -107,8 +105,6 @@ static const struct edid_quirk {
        { "ACR", 44358, EDID_QUIRK_PREFER_LARGE_60 },
        /* Acer F51 */
        { "API", 0x7602, EDID_QUIRK_PREFER_LARGE_60 },
-       /* Unknown Acer */
-       { "ACR", 2423, EDID_QUIRK_FIRST_DETAILED_PREFERRED },
 
        /* AEO model 0 reports 8 bpc, but is a 6 bpc panel */
        { "AEO", 0, EDID_QUIRK_FORCE_6BPC },
@@ -145,12 +141,6 @@ static const struct edid_quirk {
        { "LPL", 0, EDID_QUIRK_DETAILED_USE_MAXIMUM_SIZE },
        { "LPL", 0x2a00, EDID_QUIRK_DETAILED_USE_MAXIMUM_SIZE },
 
-       /* Philips 107p5 CRT */
-       { "PHL", 57364, EDID_QUIRK_FIRST_DETAILED_PREFERRED },
-
-       /* Proview AY765C */
-       { "PTS", 765, EDID_QUIRK_FIRST_DETAILED_PREFERRED },
-
        /* Samsung SyncMaster 205BW.  Note: irony */
        { "SAM", 541, EDID_QUIRK_DETAILED_SYNC_PP },
        /* Samsung SyncMaster 22[5-6]BW */
@@ -172,6 +162,25 @@ static const struct edid_quirk {
        /* Rotel RSX-1058 forwards sink's EDID but only does HDMI 1.1*/
        { "ETR", 13896, EDID_QUIRK_FORCE_8BPC },
 
+       /* Valve Index Headset */
+       { "VLV", 0x91a8, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91b0, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91b1, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91b2, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91b3, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91b4, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91b5, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91b6, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91b7, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91b8, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91b9, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91ba, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91bb, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91bc, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91bd, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91be, EDID_QUIRK_NON_DESKTOP },
+       { "VLV", 0x91bf, EDID_QUIRK_NON_DESKTOP },
+
        /* HTC Vive and Vive Pro VR Headsets */
        { "HVR", 0xaa01, EDID_QUIRK_NON_DESKTOP },
        { "HVR", 0xaa02, EDID_QUIRK_NON_DESKTOP },