xf86-video-modesetting: 2 commits - configure.ac src/driver.c

[Dave Airlie]

 configure.ac |    2 +-
 src/driver.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cc00491b3eca16b2e2bdb48fa3d8e5ffba7a9671
Author: James Simmons <jsimmons at infradead.org>
Date:   Thu Nov 3 13:20:18 2011 +0000

    don't map cursors in sw cursor mode

diff --git a/src/driver.c b/src/driver.c
index 7df587e..7060d37 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -551,7 +551,8 @@ CreateScreenResources(ScreenPtr pScreen)
 
     drmmode_uevent_init(pScrn, &ms->drmmode);
 
-    drmmode_map_cursor_bos(pScrn, &ms->drmmode);
+    if (!ms->SWCursor)
+        drmmode_map_cursor_bos(pScrn, &ms->drmmode);
     pixels = drmmode_map_front_bo(&ms->drmmode);
     if (!pixels)
 	return FALSE;
commit b09c4757a91c2c2b18f1c828e0c23af794399816
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Nov 3 13:18:46 2011 +0000

    configure: don't require xvmc.
    
    Not needed in here

diff --git a/configure.ac b/configure.ac
index 12251fe..fcfe330 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.