Re: [Intel-gfx] [PATCH 38/49] drm/i915: Skip allocating shadow batch for 0-length batches

2015-03-30 Thread Chris Wilson 
On Fri, Mar 27, 2015 at 11:02:10AM +, Chris Wilson wrote:
 Since
 
 commit 17cabf571e50677d980e9ab2a43c5f11213003ae
 Author: Chris Wilson ch...@chris-wilson.co.uk
 Date:   Wed Jan 14 11:20:57 2015 +
 
 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.

The original failure was in

committ b9ffd80ed659c559152c042e74741f4f60cac691
Author: Brad Volkin bradley.d.vol...@intel.com
Date:   Thu Dec 11 12:13:10 2014 -0800

drm/i915: Use batch length instead of object size in command parser

merged in the v4.0 cycle.

Jani, pretty please?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 38/49] drm/i915: Skip allocating shadow batch for 0-length batches

2015-03-30 Thread Daniel Vetter 
On Mon, Mar 30, 2015 at 01:02:50PM +0100, Chris Wilson wrote:
 On Fri, Mar 27, 2015 at 11:02:10AM +, Chris Wilson wrote:
  Since
  
  commit 17cabf571e50677d980e9ab2a43c5f11213003ae
  Author: Chris Wilson ch...@chris-wilson.co.uk
  Date:   Wed Jan 14 11:20:57 2015 +
  
  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.
 
 The original failure was in
 
 committ b9ffd80ed659c559152c042e74741f4f60cac691
 Author: Brad Volkin bradley.d.vol...@intel.com
 Date:   Thu Dec 11 12:13:10 2014 -0800
 
 drm/i915: Use batch length instead of object size in command parser
 
 merged in the v4.0 cycle.
 
 Jani, pretty please?

Cherry-picked and added the real sha1 citation, thanks.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 38/49] drm/i915: Skip allocating shadow batch for 0-length batches

2015-03-27 Thread Chris Wilson 
Since

commit 17cabf571e50677d980e9ab2a43c5f11213003ae
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Wed Jan 14 11:20:57 2015 +

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: Chris Wilson ch...@chris-wilson.co.uk
---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c 
b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 403450f4e4ee..19c5fc6ae1e0 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1561,7 +1561,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,
-- 
2.1.4

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 38/49] drm/i915: Skip allocating shadow batch for 0-length batches

2015-03-27 Thread Daniel Vetter 
On Fri, Mar 27, 2015 at 11:02:10AM +, Chris Wilson wrote:
 Since
 
 commit 17cabf571e50677d980e9ab2a43c5f11213003ae
 Author: Chris Wilson ch...@chris-wilson.co.uk
 Date:   Wed Jan 14 11:20:57 2015 +
 
 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: Chris Wilson ch...@chris-wilson.co.uk

Queued for -next, thanks for the patch.
-Daniel

 ---
  drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c 
 b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
 index 403450f4e4ee..19c5fc6ae1e0 100644
 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
 @@ -1561,7 +1561,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,
 -- 
 2.1.4
 
 ___
 Intel-gfx mailing list
 Intel-gfx@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx