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

diff --cc drivers/char/agp/intel-gtt.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
index 664300986fb4ed2d9c9132a02539230d9caf070b,e6800819bca846f6a3fd102ef37e2632858247f8..e9fb8953c6066494c58aaeb6e31a993125a8e93a
--- 1/drivers/gpu/drm/i915/i915_dma.c
--- 2/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -772,9 -767,9 +772,12 @@@ static int i915_getparam(struct drm_dev
        case I915_PARAM_HAS_BLT:
                value = HAS_BLT(dev);
                break;
 +      case I915_PARAM_HAS_RELAXED_FENCING:
 +              value = 1;
 +              break;
+       case I915_PARAM_HAS_COHERENT_RINGS:
+               value = 1;
+               break;
        default:
                DRM_DEBUG_DRIVER("Unknown parameter %d\n",
                                 param->param);