[Bug 94585] [BXT-P/KBL/] igt/gem_reset_stats / some ban subtests fail

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=94585

--- Comment #11 from maria guadalupe <maria.g.perez.ibarra at intel.com> ---
(In reply to Chris Wilson from comment #7)
> commit e075a32f515becef66dc849f5eca47409ccf5473
> Author: Chris Wilson <chris at chris-wilson.co.uk>
> Date:   Fri May 13 11:57:22 2016 +0100
> 
>     drm/i915: Stop automatically retiring requests after a GPU hang
>     
>     Following a GPU hang, we break out of the request loop in order to
>     unlock the struct_mutex for use by the GPU reset. However, if we retire
>     all the requests at that moment, we cannot identify the guilty request
>     after performing the reset.
>     
>     v2: Not automatically retiring requests forces us to recheck for
>     available ringspace.
>     
>     Fixes: f4457ae71fd6 ("drm/i915: Prevent leaking of -EIO from
> i915_wait_request()")
>     Testcase: igt/gem_reset_stats/ban-*
>     Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
>     Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
>     Cc: Mika Kuoppala <mika.kuoppala at intel.com>
>     Tested-by: Mika Kuoppala <mika.kuoppala at intel.com>
>     Reviewed-by: Mika Kuoppala <mika.kuoppala at intel.com>
>     Link:
> http://patchwork.freedesktop.org/patch/msgid/1463137042-9669-4-git-send-
> email-chris at chris-wilson.co.uk
> 
> and
> 
> commit e380239dc838f1e8a2ebcc9ddac556e3842ea195
> Author: Chris Wilson <chris at chris-wilson.co.uk>
> Date:   Fri May 13 10:30:05 2016 +0100
> 
>     igt/gem_reset_stats: Fix pending batch count for bans
>     
>     Since 9ba9af2ea4 ("lib: Skip execution in gem_has_ring()"), we no longer
>     do a double execbuf for each hang, as the gem_require_ring() check now
>     does a dummy execution that does not contribuee to the pending batch
>     count.
>     
>     Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

Hi Chris :

after do a checkout in the commit e075a32f515becef66dc849f5eca47409ccf5473
(drm-intel-nightly) i get the following issue when i trying to apply the patch
form
http://patchwork.freedesktop.org/patch/msgid/1463137042-9669-4-git-send-email-chris@chris-wilson.co.uk

$: patch -p1
<CI-4-4-drm-i915-Stop-automatically-retiring-requests-after-a-GPU-hang.patch
patching file drivers/gpu/drm/i915/i915_gem.c
Reversed (or previously applied) patch detected!  Assume -R? [n] -R
Apply anyway? [n] y
Hunk #1 FAILED at 1462.
Hunk #2 FAILED at 1519.
2 out of 2 hunks FAILED -- saving rejects to file
drivers/gpu/drm/i915/i915_gem.c.rej
patching file drivers/gpu/drm/i915/intel_ringbuffer.c


do you have any recommendation here ?
thanks in advanced

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are the QA Contact for the bug.
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20160601/35f4dd74/attachment.html>