diff options
| author | Paul Mackerras <paulus@samba.org> | 2009-04-21 23:02:09 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-04-21 23:02:09 -0400 |
| commit | 5bd3ef84d73c2ea7b4babbad060909753c4828d4 (patch) | |
| tree | fdf2bafb48ae1ed03175f6c77a7548a181e69ee9 /include/drm/i915_drm.h | |
| parent | 0658c16056660886ea2f35c4f038be70a94b1532 (diff) | |
| parent | 6d25b688ecc488753af3c9e6f6a9a575b863cf37 (diff) | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
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 */ |