From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/2] drm/i915: Complete pending resets before get-reset-stats ioctl
Date: Fri, 13 May 2016 13:12:42 +0300 [thread overview]
Message-ID: <87r3d6mfl1.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <1463132353-3628-2-git-send-email-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> [ text/plain ]
> The get-reset-stats ioctls wasn't waiting for a pending reset before
> reporting its statistics, and so was ignoring a hang generated by the
> context that should have been reported against said context.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This is the fix we are looking for. And so blatantly obvious that
I blame myself for walking past this yesterday.
Testcase: igt/gem_reset_stats/reset_stats-*
Tested-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index f3c76ca6b411..2aedd188473d 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -1056,7 +1056,7 @@ int i915_gem_context_reset_stats_ioctl(struct drm_device *dev,
> if (args->ctx_id == DEFAULT_CONTEXT_HANDLE && !capable(CAP_SYS_ADMIN))
> return -EPERM;
>
> - ret = mutex_lock_interruptible(&dev->struct_mutex);
> + ret = i915_mutex_lock_interruptible(dev);
> if (ret)
> return ret;
>
> --
> 2.8.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-05-13 10:15 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 10:25 [PATCH 1/2] drm/i915: Stop retiring requests from busy-ioctl Chris Wilson
2016-05-12 10:25 ` [PATCH 2/2] drm/i915: Stop automatically retiring requests after a GPU hang Chris Wilson
2016-05-13 7:57 ` [PATCH v2] " Chris Wilson
2016-05-13 8:43 ` Mika Kuoppala
2016-05-13 9:38 ` Chris Wilson
2016-05-13 9:39 ` [PATCH 1/2] drm/i915: Move get-reset-stats ioctl from intel_uncore.c to i915_gem_context.c Chris Wilson
2016-05-13 9:39 ` [PATCH 2/2] drm/i915: Complete pending resets before get-reset-stats ioctl Chris Wilson
2016-05-13 10:12 ` Mika Kuoppala [this message]
2016-05-13 9:51 ` [PATCH 1/2] drm/i915: Move get-reset-stats ioctl from intel_uncore.c to i915_gem_context.c Mika Kuoppala
2016-05-13 10:48 ` [PATCH v2] drm/i915: Stop automatically retiring requests after a GPU hang Mika Kuoppala
2016-05-13 8:25 ` ✗ Ro.CI.BAT: failure for series starting with [1/2] drm/i915: Stop retiring requests from busy-ioctl (rev2) Patchwork
2016-05-13 8:38 ` [PATCH 1/2] drm/i915: Stop retiring requests from busy-ioctl Tvrtko Ursulin
2016-05-13 8:50 ` Chris Wilson
2016-05-13 9:01 ` Tvrtko Ursulin
2016-05-13 10:30 ` [PATCH v2] drm/i915: Stop retiring requests from busy/wait ioctls Chris Wilson
2016-05-13 9:48 ` ✗ Ro.CI.BAT: failure for series starting with [1/2] drm/i915: Stop retiring requests from busy-ioctl (rev4) Patchwork
2016-05-13 10:40 ` [PATCH 1/2] drm/i915: Stop retiring requests from busy-ioctl Mika Kuoppala
2016-05-13 11:00 ` ✗ Ro.CI.BAT: failure for series starting with [v2] drm/i915: Stop retiring requests from busy/wait ioctls (rev5) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r3d6mfl1.fsf@gaia.fi.intel.com \
--to=mika.kuoppala@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox