xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/modes/xf86EdidModes.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 9874f73e88678c9eacbcba05e52336fc63a32712
Author: Kai-Heng Feng <kai.heng.feng at canonical.com>
Date:   Thu Dec 15 13:56:38 2016 +0800

    edid: Add quirk for ADA 1024x600 7" display.
    
    Detailed mode reports 108 mm x 68 mm which is for smaller display.
    Maximum image size reports 15 cm x 10 cm which aligns with its physical
    size, use this size instead.
    
    Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
    Acked-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index f24294e..f0e1e97 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -153,6 +153,11 @@ quirk_detailed_v_in_cm(int scrnIndex, xf86MonPtr DDC)
 static Bool
 quirk_detailed_use_maximum_size(int scrnIndex, xf86MonPtr DDC)
 {
+    /* ADA 1024x600 7" display */
+    if (memcmp(DDC->vendor.name, "ADA", 4) == 0 &&
+        DDC->vendor.prod_id == 4)
+        return TRUE;
+
     /* Bug #21324: Iiyama Vision Master 450 */
     if (memcmp(DDC->vendor.name, "IVM", 4) == 0 && DDC->vendor.prod_id == 6400)
         return TRUE;