File U_04-sna-Hide-compiler-warnings-for-change-in-u... of Package xf86-video-intel

Overview Repositories Revisions Requests Users Attributes Meta

File U_04-sna-Hide-compiler-warnings-for-change-in-uAPI-defines.patch of Package xf86-video-intel

From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Jun 20 12:04:02 2016 +0100
Subject: [PATCH 4/5]sna: Hide compiler warnings for change in uAPI defines
Patch-mainline: 7b6e219fe461fbbe0bd498f7731781358d11f934
Git-repo: git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
References: boo#984747
Signed-off-by: Max Staudt <mstaudt@suse.de>

Just a minor, safe, change in the uAPI defines for DRM_CAP_CURSOR_WIDTH
causes the compiler to spit out a warning. (The warning was intentional
to check that when the defines were added to the uAPI they matched. Now
that they are concrete in the uABI, but the defines are subject to the
whims of the author.)

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_display.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 9775c3e..3b36159 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -6232,8 +6232,12 @@ sna_cursor_pre_init(struct sna *sna)
 		return;

#define LOCAL_IOCTL_GET_CAP	DRM_IOWR(0x0c, struct local_get_cap)
-#define DRM_CAP_CURSOR_WIDTH	8
-#define DRM_CAP_CURSOR_HEIGHT	9
+#ifndef DRM_CAP_CURSOR_WIDTH
+#define DRM_CAP_CURSOR_WIDTH	0x8
+#endif
+#ifndef DRM_CAP_CURSOR_HEIGHT
+#define DRM_CAP_CURSOR_HEIGHT	0x9
+#endif

#define I915_PARAM_HAS_COHERENT_PHYS_GTT 29

Places

File U_04-sna-Hide-compiler-warnings-for-change-in-uAPI-defines.patch of Package xf86-video-intel

Places