From f9f85b88032b2458d4d24ceca450fdaa65e6b94d Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 12 Nov 2014 11:50:33 +0000 Subject: [PATCH] sna: Reorder PARAMs based on upstream inclusion Signed-off-by: Chris Wilson --- src/sna/kgem.c | 2 +- src/sna/sna_display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sna/kgem.c b/src/sna/kgem.c index dd918011..e8d71d80 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -140,7 +140,7 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags); #define LOCAL_I915_PARAM_HAS_NO_RELOC 25 #define LOCAL_I915_PARAM_HAS_HANDLE_LUT 26 #define LOCAL_I915_PARAM_HAS_WT 27 -#define LOCAL_I915_PARAM_MMAP_VERSION 29 +#define LOCAL_I915_PARAM_MMAP_VERSION 30 #define LOCAL_I915_EXEC_IS_PINNED (1<<10) #define LOCAL_I915_EXEC_NO_RELOC (1<<11) diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index d098642d..0b7e838b 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -5034,7 +5034,7 @@ sna_cursor_pre_init(struct sna *sna) #define DRM_CAP_CURSOR_WIDTH 8 #define DRM_CAP_CURSOR_HEIGHT 9 -#define I915_PARAM_HAS_COHERENT_PHYS_GTT 30 +#define I915_PARAM_HAS_COHERENT_PHYS_GTT 29 sna->cursor.max_size = 64;