xserver: Branch 'master'

[Kenneth Graunke]

 hw/xfree86/drivers/modesetting/drmmode_display.c |   30 -----------------------
 hw/xfree86/drivers/modesetting/drmmode_display.h |    1 
 2 files changed, 31 deletions(-)

New commits:
commit d3d4ff0ed4d4679b7983b1a3ea267ff945f7643c
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Jul 28 07:28:51 2016 -0700

    modesetting: Delete dead drmmode_bo_for_pixmap function.
    
    Embarassingly, it looks like I introduced this dead function in
    commit 13c7d53df8dac45ea2a685826cd45a39bcb51657 a year ago.
    Nothing ever used it, not even then.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 2cdcad1..1dad66a 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -179,36 +179,6 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
 }
 
 Bool
-drmmode_bo_for_pixmap(drmmode_ptr drmmode, drmmode_bo *bo, PixmapPtr pixmap)
-{
-#ifdef GLAMOR
-    ScreenPtr screen = xf86ScrnToScreen(drmmode->scrn);
-    CARD16 pitch;
-    CARD32 size;
-    int fd;
-
-#ifdef GLAMOR_HAS_GBM
-    if (drmmode->glamor) {
-        bo->gbm = glamor_gbm_bo_from_pixmap(screen, pixmap);
-        bo->dumb = NULL;
-        return bo->gbm != NULL;
-    }
-#endif
-
-    fd = glamor_fd_from_pixmap(screen, pixmap, &pitch, &size);
-    if (fd < 0) {
-        xf86DrvMsg(drmmode->scrn->scrnIndex, X_ERROR,
-                   "Failed to get fd for flip to new front.\n");
-        return FALSE;
-    }
-    bo->dumb = dumb_get_bo_from_fd(drmmode->fd, fd, pitch, size);
-    close(fd);
-#endif
-
-    return bo->dumb != NULL;
-}
-
-Bool
 drmmode_SetSlaveBO(PixmapPtr ppix,
                    drmmode_ptr drmmode, int fd_handle, int pitch, int size)
 {
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.h b/hw/xfree86/drivers/modesetting/drmmode_display.h
index d9b04d7..5499c16 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.h
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.h
@@ -160,7 +160,6 @@ extern DevPrivateKeyRec msPixmapPrivateKeyRec;
 
 #define msGetPixmapPriv(drmmode, p) ((msPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, &(drmmode)->pixmapPrivateKeyRec))
 
-Bool drmmode_bo_for_pixmap(drmmode_ptr drmmode, drmmode_bo *bo, PixmapPtr pixmap);
 int drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo);
 uint32_t drmmode_bo_get_pitch(drmmode_bo *bo);
 uint32_t drmmode_bo_get_handle(drmmode_bo *bo);