Merge branch 'drm-intel-fixes' into drm-intel-next

Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	include/drm/i915_drm.h

1 files changed, 1 insertions, 0 deletions

diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index b20dbb2d7174..a2776e2807a4 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -288,6 +288,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_BSD               10
 #define I915_PARAM_HAS_BLT               11
 #define I915_PARAM_HAS_RELAXED_FENCING   12
+#define I915_PARAM_HAS_COHERENT_RINGS    13
 
 typedef struct drm_i915_getparam {
         int param;