diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-07 11:46:23 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-07 11:46:23 -0400 |
| commit | 5f63e885ac32429fc1340f5a61e1484022efc773 (patch) | |
| tree | f9a21a6902e1857274775b96d561d8be17287860 /drivers/gpu/drm/i915/i915_gem_execbuffer.c | |
| parent | b6d2d3289f84e9c7449dff04fb959e29207acd80 (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
Merge tag 'v4.0-rc7' into next
Sync up with Linux 4.0-rc7 to bring in ALPS changes.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index b773368fc62c..38a742532c4f 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
| @@ -1487,7 +1487,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, | |||
| 1487 | goto err; | 1487 | goto err; |
| 1488 | } | 1488 | } |
| 1489 | 1489 | ||
| 1490 | if (i915_needs_cmd_parser(ring)) { | 1490 | if (i915_needs_cmd_parser(ring) && args->batch_len) { |
| 1491 | batch_obj = i915_gem_execbuffer_parse(ring, | 1491 | batch_obj = i915_gem_execbuffer_parse(ring, |
| 1492 | &shadow_exec_entry, | 1492 | &shadow_exec_entry, |
| 1493 | eb, | 1493 | eb, |