Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 743e78c1 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Skip allocating shadow batch for 0-length batches 



Since

commit 17cabf57
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Wed Jan 14 11:20:57 2015 +0000

    drm/i915: Trim the command parser allocations

we may then try to allocate a zero-sized object and attempt to extract
its pages. Understandably this fails.

Testcase: igt/gem_exec_nop #ivb,byt,hsw
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9d918c15

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1547,7 +1547,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,