xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/drivers/modesetting/drmmode_display.c |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 7004a7c3c983b4453756b92341bf22790b1eb98d
Author: Daniel Stone <daniels at collabora.com>
Date:   Fri Mar 23 13:50:23 2018 +0000

    modesetting/drmmode: Remove unused flink call
    
    We don't use flink in the GetFB import path anymore, as we do an
    FD-based import instead.
    
    Signed-off-by: Daniel Stone <daniels at collabora.com>
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 47c11adce..755a61def 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -1064,7 +1064,6 @@ create_pixmap_for_fbcon(drmmode_ptr drmmode, ScrnInfoPtr pScrn, int fbcon_id)
 {
     PixmapPtr pixmap = drmmode->fbcon_pixmap;
     drmModeFBPtr fbcon;
-    struct drm_gem_flink flink;
     ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     Bool ret;
 
@@ -1080,12 +1079,6 @@ create_pixmap_for_fbcon(drmmode_ptr drmmode, ScrnInfoPtr pScrn, int fbcon_id)
         fbcon->height != pScrn->virtualY)
         goto out_free_fb;
 
-    flink.handle = fbcon->handle;
-    if (ioctl(drmmode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Couldn't flink fbcon handle\n");
-        goto out_free_fb;
-    }
-
     pixmap = drmmode_create_pixmap_header(pScreen, fbcon->width,
                                           fbcon->height, fbcon->depth,
                                           fbcon->bpp, fbcon->pitch, NULL);