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

[Dave Airlie]

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

New commits:
commit 07c5d9cb782fde2a073efdc437489d6c4b432d46
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri May 2 13:16:05 2014 +1000

    modesetting: fix build regression against older servers.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/driver.c b/src/driver.c
index b5fcdaf..21274a9 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -217,7 +217,7 @@ static Bool probe_hw(const char *dev, struct xf86_platform_device *platform_dev)
 {
     int fd;
 
-#if XSERVER_PLATFORM_BUS
+#if XF86_PDEV_SERVER_FD
     if (platform_dev && (platform_dev->flags & XF86_PDEV_SERVER_FD)) {
         fd = xf86_get_platform_device_int_attrib(platform_dev, ODEV_ATTRIB_FD, -1);
         if (fd == -1)
commit 32fb5f2d821e5e13038eab7db35c5048ad807ccc
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri May 2 13:14:30 2014 +1000

    modesetting: fix use after free.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 28a4abb..c533324 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -778,11 +778,11 @@ drmmode_output_destroy(xf86OutputPtr output)
 		drmModeFreeProperty(drmmode_output->props[i].mode_prop);
 		free(drmmode_output->props[i].atoms);
 	}
+	free(drmmode_output->props);
 	for (i = 0; i < drmmode_output->mode_output->count_encoders; i++) {
 		drmModeFreeEncoder(drmmode_output->mode_encoders[i]);
-		free(drmmode_output->mode_encoders);
 	}
-	free(drmmode_output->props);
+	free(drmmode_output->mode_encoders);
 	drmModeFreeConnector(drmmode_output->mode_output);
 	free(drmmode_output);
 	output->driver_private = NULL;