xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/dri2/dri2.c |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit ff560488558deb299b0822a3e3bc66672f4c690f
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jan 23 14:23:40 2019 -0500

    dri2: Stop pretending VGA arbitration matters
    
    The VGA arbiter controls the PCI bus' routing of legacy VGA resources,
    specifically the video memory aperture at 0xa0000-0xb0000 (640k should
    be etc.) and a handful of I/O ports. Since 128k is far too small for a
    real framebuffer these days, every driver instead maps a linear version
    of VRAM through the PCI BAR. And no DRI2 drivers ever need I/O port
    access, because all operations they might be used for (legacy VGA CRTC
    setup, mostly) happen on the kernel side.
    
    In other words, this just works, and we can stop breaking it.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Dave Airlie <airlied at redhat.com>

diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 266d6e66d..b913c2220 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -44,7 +44,6 @@
 #include "dixstruct.h"
 #include "dri2.h"
 #include "dri2int.h"
-#include "xf86VGAarbiter.h"
 #include "damage.h"
 #include "xf86.h"
 
@@ -1507,12 +1506,6 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
     if (info->version < 3)
         return FALSE;
 
-    if (!xf86VGAarbiterAllowDRI(pScreen)) {
-        xf86DrvMsg(pScreen->myNum, X_WARNING,
-                   "[DRI2] Direct rendering is not supported when VGA arb is necessary for the device\n");
-        return FALSE;
-    }
-
     if (!dixRegisterPrivateKey(&dri2ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
         return FALSE;