diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-11-23 10:49:15 +0000 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-11-23 14:23:00 +0000 |
| commit | 793b61ea9f9972be0836a9a15d0d6a520daaf124 (patch) | |
| tree | 482da2f2bb2a64a79288ca0d364504e062c8655f | |
| parent | e853ab7ca3f6c88cbef18fbc6f6ba6a031d9ac14 (diff) | |
| download | linux-793b61ea9f9972be0836a9a15d0d6a520daaf124.tar.gz | |
drm/i915: i915_gem_alloc_context_obj can be static
It has only one call site from the same file.
v2: Also rename it to alloc_context_obj. (Chris Wilson)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1479898155-21014-1-git-send-email-tvrtko.ursulin@linux.intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 970e50bf9884..c44f2410f10f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3342,8 +3342,6 @@ struct i915_vma * i915_gem_context_pin_legacy(struct i915_gem_context *ctx, unsigned int flags); void i915_gem_context_free(struct kref *ctx_ref); -struct drm_i915_gem_object * -i915_gem_alloc_context_obj(struct drm_device *dev, size_t size); struct i915_gem_context * i915_gem_context_create_gvt(struct drm_device *dev); diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index f82936a2fcce..a6add0c14045 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -166,8 +166,8 @@ void i915_gem_context_free(struct kref *ctx_ref) kfree(ctx); } -struct drm_i915_gem_object * -i915_gem_alloc_context_obj(struct drm_device *dev, size_t size) +static struct drm_i915_gem_object * +alloc_context_obj(struct drm_device *dev, u64 size) { struct drm_i915_gem_object *obj; int ret; @@ -286,8 +286,7 @@ __create_hw_context(struct drm_device *dev, struct drm_i915_gem_object *obj; struct i915_vma *vma; - obj = i915_gem_alloc_context_obj(dev, - dev_priv->hw_context_size); + obj = alloc_context_obj(dev, dev_priv->hw_context_size); if (IS_ERR(obj)) { ret = PTR_ERR(obj); goto err_out; |