diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 05:12:55 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 05:12:55 -0400 |
| commit | f3831a592fe4332a70baad64a860b345398885b7 (patch) | |
| tree | fd27b986295fe5a4f1c0924a804228f829a4c894 /include/drm/i915_drm.h | |
| parent | 376f7839b72ec526173cafb5d8eadfc61e2effdf (diff) | |
| parent | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (diff) | |
Merge commit 'takashi/topic/asoc' into for-2.6.31
Diffstat (limited to 'include/drm/i915_drm.h')
| -rw-r--r-- | include/drm/i915_drm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 67e3353a56d6..95962fa8398a 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h | |||
| @@ -594,6 +594,9 @@ struct drm_i915_gem_busy { | |||
| 594 | #define I915_BIT_6_SWIZZLE_9_10_11 4 | 594 | #define I915_BIT_6_SWIZZLE_9_10_11 4 |
| 595 | /* Not seen by userland */ | 595 | /* Not seen by userland */ |
| 596 | #define I915_BIT_6_SWIZZLE_UNKNOWN 5 | 596 | #define I915_BIT_6_SWIZZLE_UNKNOWN 5 |
| 597 | /* Seen by userland. */ | ||
| 598 | #define I915_BIT_6_SWIZZLE_9_17 6 | ||
| 599 | #define I915_BIT_6_SWIZZLE_9_10_17 7 | ||
| 597 | 600 | ||
| 598 | struct drm_i915_gem_set_tiling { | 601 | struct drm_i915_gem_set_tiling { |
| 599 | /** Handle of the buffer to have its tiling state updated */ | 602 | /** Handle of the buffer to have its tiling state updated */ |