<html>
<head>
<base href="https://bugs.freedesktop.org/">
</head>
<body>
<p>
<div>
<b><a class="bz_bug_link
bz_status_RESOLVED bz_closed"
title="RESOLVED FIXED - [BXT-P/KBL/] igt/gem_reset_stats / some ban subtests fail"
href="https://bugs.freedesktop.org/show_bug.cgi?id=94585#c11">Comment # 11</a>
on <a class="bz_bug_link
bz_status_RESOLVED bz_closed"
title="RESOLVED FIXED - [BXT-P/KBL/] igt/gem_reset_stats / some ban subtests fail"
href="https://bugs.freedesktop.org/show_bug.cgi?id=94585">bug 94585</a>
from <span class="vcard"><a class="email" href="mailto:maria.g.perez.ibarra@intel.com" title="maria guadalupe <maria.g.perez.ibarra@intel.com>"> <span class="fn">maria guadalupe</span></a>
</span></b>
<pre>(In reply to Chris Wilson from <a href="show_bug.cgi?id=94585#c7">comment #7</a>)
<span class="quote">> commit e075a32f515becef66dc849f5eca47409ccf5473
> Author: Chris Wilson <<a href="mailto:chris@chris-wilson.co.uk">chris@chris-wilson.co.uk</a>>
> 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 <<a href="mailto:chris@chris-wilson.co.uk">chris@chris-wilson.co.uk</a>>
> Cc: Daniel Vetter <<a href="mailto:daniel.vetter@ffwll.ch">daniel.vetter@ffwll.ch</a>>
> Cc: Mika Kuoppala <<a href="mailto:mika.kuoppala@intel.com">mika.kuoppala@intel.com</a>>
> Tested-by: Mika Kuoppala <<a href="mailto:mika.kuoppala@intel.com">mika.kuoppala@intel.com</a>>
> Reviewed-by: Mika Kuoppala <<a href="mailto:mika.kuoppala@intel.com">mika.kuoppala@intel.com</a>>
> Link:
> <a href="http://patchwork.freedesktop.org/patch/msgid/1463137042-9669-4-git-send">http://patchwork.freedesktop.org/patch/msgid/1463137042-9669-4-git-send</a>-
> <a href="mailto:email-chris@chris-wilson.co.uk">email-chris@chris-wilson.co.uk</a>
>
> and
>
> commit e380239dc838f1e8a2ebcc9ddac556e3842ea195
> Author: Chris Wilson <<a href="mailto:chris@chris-wilson.co.uk">chris@chris-wilson.co.uk</a>>
> 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 <<a href="mailto:chris@chris-wilson.co.uk">chris@chris-wilson.co.uk</a>></span >
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
<a href="http://patchwork.freedesktop.org/patch/msgid/1463137042-9669-4-git-send-email-chris@chris-wilson.co.uk">http://patchwork.freedesktop.org/patch/msgid/1463137042-9669-4-git-send-email-chris@chris-wilson.co.uk</a>
$: 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</pre>
</div>
</p>
<hr>
<span>You are receiving this mail because:</span>
<ul>
<li>You are the assignee for the bug.</li>
<li>You are the QA Contact for the bug.</li>
<li>You are on the CC list for the bug.</li>
</ul>
</body>
</html>