[Intel-gfx] [PATCH 06/10] drm/i915: Remove some single use locals i915_gem_do_execbuffer

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursu...@intel.com>

Remove ctx_id, ggtt and vm since they are single use.

     text    data     bss     dec     hex filename
  1085338   26398    2628 1114364  1100fc i915.ko.0
  1085290   26398    2628 1114316  1100cc i915.ko.1

Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c 
b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 82e74db5923b..57ae6573a37b 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1573,16 +1573,13 @@ i915_gem_do_execbuffer(struct drm_device *dev, void 
*data,
                       struct drm_i915_gem_exec_object2 *exec)
 {
        struct drm_i915_private *dev_priv = to_i915(dev);
-       struct i915_ggtt *ggtt = &dev_priv->ggtt;
        struct eb_vmas *eb;
        struct drm_i915_gem_exec_object2 shadow_exec_entry;
        struct intel_engine_cs *engine;
        struct i915_gem_context *ctx;
-       struct i915_address_space *vm;
        struct drm_i915_gem_request *req;
        struct i915_vma *batch;
        u32 batch_start;
-       const u32 ctx_id = i915_execbuffer2_get_context_id(*args);
        u32 dispatch_flags;
        struct dma_fence *in_fence = NULL;
        struct sync_file *out_fence = NULL;
@@ -1659,7 +1656,8 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
        if (ret)
                goto pre_mutex_err;
 
-       ctx = i915_gem_validate_context(dev, file, engine, ctx_id);
+       ctx = i915_gem_validate_context(dev, file, engine,
+                                       i915_execbuffer2_get_context_id(*args));
        if (IS_ERR(ctx)) {
                mutex_unlock(&dev->struct_mutex);
                ret = PTR_ERR(ctx);
@@ -1668,11 +1666,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, void 
*data,
 
        i915_gem_context_get(ctx);
 
-       if (ctx->ppgtt)
-               vm = &ctx->ppgtt->base;
-       else
-               vm = &ggtt->base;
-
        eb = eb_create(dev_priv, args);
        if (eb == NULL) {
                i915_gem_context_put(ctx);
@@ -1682,7 +1675,8 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
        }
 
        /* Look up object handles */
-       ret = eb_lookup_vmas(eb, exec, args, vm, file);
+       ret = eb_lookup_vmas(eb, exec, args, ctx->ppgtt ? &ctx->ppgtt->base :
+                            &dev_priv->ggtt.base, file);
        if (ret)
                goto err;
 
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx