xf86-video-modesetting: 3 commits - autogen.sh configure.ac Makefile.am src/driver.c

[Dave Airlie]

 Makefile.am  |    2 ++
 autogen.sh   |    1 +
 configure.ac |    1 +
 src/driver.c |    7 +++++--
 4 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 0ad9fb5109a3cd3bded6455aa2fca0a1fe18e980
Author: Thierry Reding <thierry.reding at avionic-design.de>
Date:   Thu Nov 8 14:28:10 2012 +0100

    Remove call to miInitializeBackingStore()
    
    Recent versions of the X server no longer provide this function, which
    has been obsolete for over 2 years now.
    
    Signed-off-by: Thierry Reding <thierry.reding at avionic-design.de>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/driver.c b/src/driver.c
index 200a6d8..05b6176 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -901,7 +901,6 @@ ScreenInit(SCREEN_INIT_ARGS_DECL)
 
     xf86SetBlackWhitePixels(pScreen);
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
commit 5b3f6e347ae1763f066848a07554e8d33e17662e
Author: Thierry Reding <thierry.reding at avionic-design.de>
Date:   Thu Nov 8 14:28:09 2012 +0100

    build: Put m4 macros in m4 subdirectory
    
    This silences a warning from libtoolize when running the autogen.sh
    script.
    
    Signed-off-by: Thierry Reding <thierry.reding at avionic-design.de>
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 8e4dfdb..a7ab3e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,8 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src man
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/autogen.sh b/autogen.sh
index 904cd67..f83ed27 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ test -z "$srcdir" && srcdir=.
 
 ORIGDIR=`pwd`
 cd $srcdir
+test -d m4 || mkdir m4
 
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
diff --git a/configure.ac b/configure.ac
index b6815c4..58b1666 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ AC_INIT([xf86-video-modesetting],
         [xf86-video-modesetting])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(.)
 AC_SYS_LARGEFILE
 
commit 07e4b5c5e766d06a91178a0ff7589c842ee509fb
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Sep 17 11:48:14 2012 +1000

    modesetting: remove alloca usage again
    
    this slipped back in.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/driver.c b/src/driver.c
index 38a1c09..200a6d8 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -428,10 +428,13 @@ static int dispatch_dirty_region(ScrnInfoPtr scrn,
     unsigned num_cliprects = REGION_NUM_RECTS(dirty);
 
     if (num_cliprects) {
-	drmModeClip *clip = alloca(num_cliprects * sizeof(drmModeClip));
+	drmModeClip *clip = malloc(num_cliprects * sizeof(drmModeClip));
 	BoxPtr rect = REGION_RECTS(dirty);
 	int i, ret;
 	    
+	if (!clip)
+	    return -ENOMEM;
+
 	/* XXX no need for copy? */
 	for (i = 0; i < num_cliprects; i++, rect++) {
 	    clip[i].x1 = rect->x1;
@@ -442,6 +445,7 @@ static int dispatch_dirty_region(ScrnInfoPtr scrn,
 
 	/* TODO query connector property to see if this is needed */
 	ret = drmModeDirtyFB(ms->fd, fb_id, clip, num_cliprects);
+	free(clip);
 	DamageEmpty(damage);
 	if (ret) {
 	    if (ret == -EINVAL)