libdrm: Changes to 'upstream-unstable'
configure.ac | 2 +-
include/drm/qxl_drm.h | 2 +-
radeon/radeon_surface.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d6861609b2b887612d652bb2be7c39f199802937
Author: Marek Olšák <marek.olsak@amd.com>
Date: Tue Jul 29 18:54:33 2014 +0200
configure.ac: bump version to 2.4.56 for release
diff --git a/configure.ac b/configure.ac
index a7be095..5e9cb6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
AC_PREREQ([2.63])
AC_INIT([libdrm],
- [2.4.55],
+ [2.4.56],
[https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
[libdrm])
commit 2169dce96c5503ef8f6e4bb008e989d0ef02ec8e
Author: Marek Olšák <marek.olsak@amd.com>
Date: Sat Jul 26 20:07:33 2014 +0200
radeon: fix typo in sample split / fixes MSAA on Hawaii
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index 9c3a192..8a1fe7d 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -1914,7 +1914,7 @@ static void cik_get_2d_params(struct radeon_surface_manager *surf_man,
sample_split = 1;
break;
case CIK__SAMPLE_SPLIT__2:
- sample_split = 1;
+ sample_split = 2;
break;
case CIK__SAMPLE_SPLIT__4:
sample_split = 4;
commit 8bdb4cfa450b16f2c70729f923fa05d9553d7118
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Mon May 5 23:28:23 2014 +0200
libdrm: Fix drm.h include in qxl drm header file
Use "drm.h" instead of "drm/drm.h" as used in the other header files.
Fixes xserver-xorg-video-qxl build with KMS support on Debian, where this
file is installed in /usr/include/libdrm.
Fixes Debian bug #746807
Reported-by: Bastian Blank <waldi@debian.org>
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h
index 5d7de70..1e331a8 100644
--- a/include/drm/qxl_drm.h
+++ b/include/drm/qxl_drm.h
@@ -25,7 +25,7 @@
#define QXL_DRM_H
#include <stddef.h>
-#include "drm/drm.h"
+#include "drm.h"
/* Please note that modifications to all structs defined here are
* subject to backwards-compatibility constraints.
Reply to: