1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 1f423bb2d644..8237b2935b5f 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -297,7 +297,8 @@ static inline u64 gen8_noncanonical_addr(u64 address)
 static inline bool eb_use_cmdparser(const struct i915_execbuffer *eb)
 {
         return intel_engine_requires_cmd_parser(eb->engine) ||
-                (intel_engine_using_cmd_parser(eb->engine) && eb->batch_len);
+                (intel_engine_using_cmd_parser(eb->engine) &&
+                 eb->args->batch_len);
 }
 
 static int eb_create(struct i915_execbuffer *eb)
@@ -2577,6 +2578,9 @@ i915_gem_do_execbuffer(struct drm_device *dev,
                 goto err_vma;
         }
 
+        if (eb.batch_len == 0)
+                eb.batch_len = eb.batch->size - eb.batch_start_offset;
+
         if (eb_use_cmdparser(&eb)) {
                 struct i915_vma *vma;
 
@@ -2587,9 +2591,6 @@ i915_gem_do_execbuffer(struct drm_device *dev,
                 }
         }
 
-        if (eb.batch_len == 0)
-                eb.batch_len = eb.batch->size - eb.batch_start_offset;
-
         /*
          * snb/ivb/vlv conflate the "batch in ppgtt" bit with the "non-secure
          * batch" bit. Hence we need to pin secure batches into the global gtt.