xf86-video-intel: src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_display.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7b6e219fe461fbbe0bd498f7731781358d11f934
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 20 12:04:02 2016 +0100

    sna: Hide compiler warnings for change in uAPI defines
    
    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 at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index a22d94e..d790975 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -6296,8 +6296,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