diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-03 09:27:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-03 09:27:48 +1000 |
| commit | 3fa50dc3be89f721f4dd64c38fd45d330f98c1f0 (patch) | |
| tree | 1be7a2b44aecd1463d2b9266056f10f5d7a01455 /drivers/gpu/drm/i915/i915_gem_execbuffer.c | |
| parent | c7d748743f3ae73f1997a0a56e34674244b99a4a (diff) | |
| parent | 840a1cf0cd533f30da792527ca5ff6a023d4a727 (diff) | |
Merge tag 'drm-intel-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel into drm-fixes
one oops fixes and a 0-length allocation fix from next backported.
* tag 'drm-intel-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Reject the colorkey ioctls for primary and cursor planes
drm/i915: Skip allocating shadow batch for 0-length batches
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, goto err; } - if (i915_needs_cmd_parser(ring)) { + if (i915_needs_cmd_parser(ring) && args->batch_len) { batch_obj = i915_gem_execbuffer_parse(ring, &shadow_exec_entry, eb, |