xserver: Branch 'master'

[Adam Jackson]

 hw/xwayland/xwayland-cvt.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 1c78bec9ca3cd1975a38bf5ebdba7dea65b309ab
Author: Svitozar Cherepii <razotivs at gmail.com>
Date:   Fri Feb 3 01:49:04 2017 +0200

    xwayland: Add hack for FWXGA resolution #99574
    
    For some applications (like fullscreen games) it matters for XRandr
    resolution to be correctly set and equal to root window resolution.
    
    In XServer there is already hack for this, adapted it for XWayland.
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=99574
    
    Signed-off-by: Svitozar Cherepii <razotivs at gmail.com>
    Tested-by: Svitozar Cherepii <razotivs at gmail.com>
    Acked-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xwayland/xwayland-cvt.c b/hw/xwayland/xwayland-cvt.c
index 9655e10..8564fdb 100644
--- a/hw/xwayland/xwayland-cvt.c
+++ b/hw/xwayland/xwayland-cvt.c
@@ -296,6 +296,13 @@ xwayland_cvt(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
     if (Interlaced)
         modeinfo.modeFlags |= RR_Interlace;
 
+    /* FWXGA hack adapted from hw/xfree86/modes/xf86EdidModes.c, because you can't say 1366 */
+    if (HDisplay == 1366 && VDisplay == 768) {
+         modeinfo.width = 1366;
+         modeinfo.hSyncStart--;
+         modeinfo.hSyncEnd--;
+    }
+
     snprintf(name, sizeof name, "%dx%d",
              modeinfo.width, modeinfo.height);
     modeinfo.nameLength = strlen(name);