diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-05 10:43:39 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-05 10:43:39 +0000 |
| commit | 5aa7d52aebfc11760bbc5b081ed621227bb77981 (patch) | |
| tree | 1bb2542ff9f8f58599325a68f3861f80be27bf26 /include/drm | |
| parent | 382ab78c0e4866eb9a812e9ba20d0f876d9634d6 (diff) | |
| parent | bbf0c6b3620b3872929ef7d3c392ce436889110f (diff) | |
| download | linux-3.10-5aa7d52aebfc11760bbc5b081ed621227bb77981.tar.gz linux-3.10-5aa7d52aebfc11760bbc5b081ed621227bb77981.tar.bz2 linux-3.10-5aa7d52aebfc11760bbc5b081ed621227bb77981.zip | |
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
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/i915_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index b20dbb2d717..a2776e2807a 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; |