aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorBen Widawsky <benjamin.widawsky@intel.com>2012-09-21 20:01:20 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-09-26 03:24:36 -0400
commit199adf40ae29a563ba0afe924e12802271defcc8 (patch)
treeaa7a2ef58b34145470ed9b0187bdc9e76ae7875d /drivers/gpu/drm/i915/i915_gem.c
parentadf00b26d18e1b3570451296e03bcb20e4798cdd (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 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 2f76905ab2b0..365a7dc8a4a8 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3185,10 +3185,10 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,
3185 return 0; 3185 return 0;
3186} 3186}
3187 3187
3188int i915_gem_get_cacheing_ioctl(struct drm_device *dev, void *data, 3188int i915_gem_get_caching_ioctl(struct drm_device *dev, void *data,
3189 struct drm_file *file) 3189 struct drm_file *file)
3190{ 3190{
3191 struct drm_i915_gem_cacheing *args = data; 3191 struct drm_i915_gem_caching *args = data;
3192 struct drm_i915_gem_object *obj; 3192 struct drm_i915_gem_object *obj;
3193 int ret; 3193 int ret;
3194 3194
@@ -3202,7 +3202,7 @@ int i915_gem_get_cacheing_ioctl(struct drm_device *dev, void *data,
3202 goto unlock; 3202 goto unlock;
3203 } 3203 }
3204 3204
3205 args->cacheing = obj->cache_level != I915_CACHE_NONE; 3205 args->caching = obj->cache_level != I915_CACHE_NONE;
3206 3206
3207 drm_gem_object_unreference(&obj->base); 3207 drm_gem_object_unreference(&obj->base);
3208unlock: 3208unlock:
@@ -3210,10 +3210,10 @@ unlock:
3210 return ret; 3210 return ret;
3211} 3211}
3212 3212
3213int i915_gem_set_cacheing_ioctl(struct drm_device *dev, void *data, 3213int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
3214 struct drm_file *file) 3214 struct drm_file *file)
3215{ 3215{
3216 struct drm_i915_gem_cacheing *args = data; 3216 struct drm_i915_gem_caching *args = data;
3217 struct drm_i915_gem_object *obj; 3217 struct drm_i915_gem_object *obj;
3218 enum i915_cache_level level; 3218 enum i915_cache_level level;
3219 int ret; 3219 int ret;
@@ -3222,11 +3222,11 @@ int i915_gem_set_cacheing_ioctl(struct drm_device *dev, void *data,
3222 if (ret) 3222 if (ret)
3223 return ret; 3223 return ret;
3224 3224
3225 switch (args->cacheing) { 3225 switch (args->caching) {
3226 case I915_CACHEING_NONE: 3226 case I915_CACHING_NONE:
3227 level = I915_CACHE_NONE; 3227 level = I915_CACHE_NONE;
3228 break; 3228 break;
3229 case I915_CACHEING_CACHED: 3229 case I915_CACHING_CACHED:
3230 level = I915_CACHE_LLC; 3230 level = I915_CACHE_LLC;
3231 break; 3231 break;
3232 default: 3232 default: