xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 83e38eb73fd8c852513aac2da2975b4c01070ec2
Author: Arun Raghavan <arun at accosted.net>
Date:   Mon Jan 6 20:29:50 2014 +0530

    edid: Add quirk for Sony Vaio Pro 13
    
    The detailed timings are for a 15.6" display when max image size
    correctly reports 13.3".
    
    Signed-off-by: Arun Raghavan <arun at accosted.net>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index a56f6ba..6fb0f9b 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -162,6 +162,11 @@ quirk_detailed_use_maximum_size(int scrnIndex, xf86MonPtr DDC)
         DDC->vendor.prod_id == 0x7f01)
         return TRUE;
 
+    /* Sony Vaio Pro 13 */
+    if (memcmp(DDC->vendor.name, "MEI", 4) == 0 &&
+        DDC->vendor.prod_id == 0x96a2)
+        return TRUE;
+
     return FALSE;
 }