From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 5 Dec 2010 10:43:39 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: firefly_0821_release~7613^2~3065^2~23^2~36
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5aa7d52aebfc11760bbc5b081ed621227bb77981;p=firefly-linux-kernel-4.4.55.git

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
---

5aa7d52aebfc11760bbc5b081ed621227bb77981
diff --cc drivers/gpu/drm/i915/i915_dma.c
index 664300986fb4,e6800819bca8..e9fb8953c606
--- a/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);