diff options
author | Ben Widawsky <benjamin.widawsky@intel.com> | 2012-09-21 20:01:20 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-09-26 03:24:36 -0400 |
commit | 199adf40ae29a563ba0afe924e12802271defcc8 (patch) | |
tree | aa7a2ef58b34145470ed9b0187bdc9e76ae7875d /include/drm | |
parent | adf00b26d18e1b3570451296e03bcb20e4798cdd (diff) |
drm/i915: s/cacheing/caching/
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/i915_drm.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index c8833009f37b..e737607e055e 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h | |||
@@ -203,8 +203,8 @@ typedef struct _drm_i915_sarea { | |||
203 | #define DRM_I915_GEM_WAIT 0x2c | 203 | #define DRM_I915_GEM_WAIT 0x2c |
204 | #define DRM_I915_GEM_CONTEXT_CREATE 0x2d | 204 | #define DRM_I915_GEM_CONTEXT_CREATE 0x2d |
205 | #define DRM_I915_GEM_CONTEXT_DESTROY 0x2e | 205 | #define DRM_I915_GEM_CONTEXT_DESTROY 0x2e |
206 | #define DRM_I915_GEM_SET_CACHEING 0x2f | 206 | #define DRM_I915_GEM_SET_CACHING 0x2f |
207 | #define DRM_I915_GEM_GET_CACHEING 0x30 | 207 | #define DRM_I915_GEM_GET_CACHING 0x30 |
208 | #define DRM_I915_REG_READ 0x31 | 208 | #define DRM_I915_REG_READ 0x31 |
209 | 209 | ||
210 | #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) | 210 | #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) |
@@ -230,8 +230,8 @@ typedef struct _drm_i915_sarea { | |||
230 | #define DRM_IOCTL_I915_GEM_PIN DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin) | 230 | #define DRM_IOCTL_I915_GEM_PIN DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin) |
231 | #define DRM_IOCTL_I915_GEM_UNPIN DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin) | 231 | #define DRM_IOCTL_I915_GEM_UNPIN DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin) |
232 | #define DRM_IOCTL_I915_GEM_BUSY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy) | 232 | #define DRM_IOCTL_I915_GEM_BUSY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy) |
233 | #define DRM_IOCTL_I915_GEM_SET_CACHEING DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHEING, struct drm_i915_gem_cacheing) | 233 | #define DRM_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHING, struct drm_i915_gem_caching) |
234 | #define DRM_IOCTL_I915_GEM_GET_CACHEING DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHEING, struct drm_i915_gem_cacheing) | 234 | #define DRM_IOCTL_I915_GEM_GET_CACHING DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHING, struct drm_i915_gem_caching) |
235 | #define DRM_IOCTL_I915_GEM_THROTTLE DRM_IO ( DRM_COMMAND_BASE + DRM_I915_GEM_THROTTLE) | 235 | #define DRM_IOCTL_I915_GEM_THROTTLE DRM_IO ( DRM_COMMAND_BASE + DRM_I915_GEM_THROTTLE) |
236 | #define DRM_IOCTL_I915_GEM_ENTERVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_ENTERVT) | 236 | #define DRM_IOCTL_I915_GEM_ENTERVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_ENTERVT) |
237 | #define DRM_IOCTL_I915_GEM_LEAVEVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_LEAVEVT) | 237 | #define DRM_IOCTL_I915_GEM_LEAVEVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_LEAVEVT) |
@@ -715,21 +715,21 @@ struct drm_i915_gem_busy { | |||
715 | __u32 busy; | 715 | __u32 busy; |
716 | }; | 716 | }; |
717 | 717 | ||
718 | #define I915_CACHEING_NONE 0 | 718 | #define I915_CACHING_NONE 0 |
719 | #define I915_CACHEING_CACHED 1 | 719 | #define I915_CACHING_CACHED 1 |
720 | 720 | ||
721 | struct drm_i915_gem_cacheing { | 721 | struct drm_i915_gem_caching { |
722 | /** | 722 | /** |
723 | * Handle of the buffer to set/get the cacheing level of. */ | 723 | * Handle of the buffer to set/get the caching level of. */ |
724 | __u32 handle; | 724 | __u32 handle; |
725 | 725 | ||
726 | /** | 726 | /** |
727 | * Cacheing level to apply or return value | 727 | * Cacheing level to apply or return value |
728 | * | 728 | * |
729 | * bits0-15 are for generic cacheing control (i.e. the above defined | 729 | * bits0-15 are for generic caching control (i.e. the above defined |
730 | * values). bits16-31 are reserved for platform-specific variations | 730 | * values). bits16-31 are reserved for platform-specific variations |
731 | * (e.g. l3$ caching on gen7). */ | 731 | * (e.g. l3$ caching on gen7). */ |
732 | __u32 cacheing; | 732 | __u32 caching; |
733 | }; | 733 | }; |
734 | 734 | ||
735 | #define I915_TILING_NONE 0 | 735 | #define I915_TILING_NONE 0 |