From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 11/19] drm/i915: Wait until the intel_wakeref idle callback is complete
Date: Tue, 19 Nov 2019 16:15:07 +0000 [thread overview]
Message-ID: <eab4f23c-821f-850d-d9aa-cc2765754991@linux.intel.com> (raw)
In-Reply-To: <20191118230254.2615942-12-chris@chris-wilson.co.uk>
On 18/11/2019 23:02, Chris Wilson wrote:
> When waiting for idle, serialise with any ongoing callback so that it
> will have completed before completing the wait.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/intel_wakeref.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_wakeref.c b/drivers/gpu/drm/i915/intel_wakeref.c
> index 9b29176cc1ca..91feb53b2942 100644
> --- a/drivers/gpu/drm/i915/intel_wakeref.c
> +++ b/drivers/gpu/drm/i915/intel_wakeref.c
> @@ -109,8 +109,15 @@ void __intel_wakeref_init(struct intel_wakeref *wf,
>
> int intel_wakeref_wait_for_idle(struct intel_wakeref *wf)
> {
> - return wait_var_event_killable(&wf->wakeref,
> - !intel_wakeref_is_active(wf));
> + int err;
> +
> + err = wait_var_event_killable(&wf->wakeref,
> + !intel_wakeref_is_active(wf));
> + if (err)
> + return err;
> +
> + intel_wakeref_unlock_wait(wf);
> + return 0;
> }
>
> static void wakeref_auto_timeout(struct timer_list *t)
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 11/19] drm/i915: Wait until the intel_wakeref idle callback is complete
Date: Tue, 19 Nov 2019 16:15:07 +0000 [thread overview]
Message-ID: <eab4f23c-821f-850d-d9aa-cc2765754991@linux.intel.com> (raw)
Message-ID: <20191119161507.2c9x10cd-0i3KvaJNEWIRexSDfM0umG-JN0fgjQqdOU@z> (raw)
In-Reply-To: <20191118230254.2615942-12-chris@chris-wilson.co.uk>
On 18/11/2019 23:02, Chris Wilson wrote:
> When waiting for idle, serialise with any ongoing callback so that it
> will have completed before completing the wait.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/intel_wakeref.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_wakeref.c b/drivers/gpu/drm/i915/intel_wakeref.c
> index 9b29176cc1ca..91feb53b2942 100644
> --- a/drivers/gpu/drm/i915/intel_wakeref.c
> +++ b/drivers/gpu/drm/i915/intel_wakeref.c
> @@ -109,8 +109,15 @@ void __intel_wakeref_init(struct intel_wakeref *wf,
>
> int intel_wakeref_wait_for_idle(struct intel_wakeref *wf)
> {
> - return wait_var_event_killable(&wf->wakeref,
> - !intel_wakeref_is_active(wf));
> + int err;
> +
> + err = wait_var_event_killable(&wf->wakeref,
> + !intel_wakeref_is_active(wf));
> + if (err)
> + return err;
> +
> + intel_wakeref_unlock_wait(wf);
> + return 0;
> }
>
> static void wakeref_auto_timeout(struct timer_list *t)
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-19 16:15 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 23:02 Fast soft-rc6 Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 01/19] drm/i915/selftests: Force bonded submission to overlap Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 02/19] drm/i915/gem: Manually dump the debug trace on GEM_BUG_ON Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 03/19] drm/i915/gt: Close race between engine_park and intel_gt_retire_requests Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 14:15 ` Tvrtko Ursulin
2019-11-19 14:15 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 14:41 ` Chris Wilson
2019-11-19 14:41 ` [Intel-gfx] " Chris Wilson
2019-11-20 11:39 ` Tvrtko Ursulin
2019-11-20 11:39 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-20 11:51 ` Chris Wilson
2019-11-20 11:51 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 04/19] drm/i915/gt: Unlock engine-pm after queuing the kernel context switch Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 14:35 ` Tvrtko Ursulin
2019-11-19 14:35 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 14:50 ` Chris Wilson
2019-11-19 14:50 ` [Intel-gfx] " Chris Wilson
2019-11-19 15:03 ` [PATCH] " Chris Wilson
2019-11-19 15:03 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 05/19] drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 14:54 ` Tvrtko Ursulin
2019-11-19 14:54 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-18 23:02 ` [PATCH 06/19] drm/i915/gt: Schedule request retirement when submission idles Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 15:04 ` Tvrtko Ursulin
2019-11-19 15:04 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 16:20 ` Chris Wilson
2019-11-19 16:20 ` [Intel-gfx] " Chris Wilson
2019-11-19 16:33 ` Tvrtko Ursulin
2019-11-19 16:33 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 16:42 ` Chris Wilson
2019-11-19 16:42 ` [Intel-gfx] " Chris Wilson
2019-11-19 18:58 ` Chris Wilson
2019-11-19 18:58 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 07/19] drm/i915: Mark up the calling context for intel_wakeref_put() Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 15:57 ` Tvrtko Ursulin
2019-11-19 15:57 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 16:12 ` Chris Wilson
2019-11-19 16:12 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 08/19] drm/i915/gem: Merge GGTT vma flush into a single loop Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 09/19] drm/i915/gt: Only wait for register chipset flush if active Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 10/19] drm/i915: Protect the obj->vma.list during iteration Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 11/19] drm/i915: Wait until the intel_wakeref idle callback is complete Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 16:15 ` Tvrtko Ursulin [this message]
2019-11-19 16:15 ` Tvrtko Ursulin
2019-11-18 23:02 ` [PATCH 12/19] drm/i915/gt: Declare timeline.lock to be irq-free Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 15:58 ` Tvrtko Ursulin
2019-11-19 15:58 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-18 23:02 ` [PATCH 13/19] drm/i915/gt: Move new timelines to the end of active_list Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 16:02 ` Tvrtko Ursulin
2019-11-19 16:02 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-18 23:02 ` [PATCH 14/19] drm/i915/gt: Schedule next retirement worker first Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 16:07 ` Tvrtko Ursulin
2019-11-19 16:07 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-18 23:02 ` [PATCH 15/19] drm/i915/gt: Flush the requests after wedging on suspend Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 16:12 ` Tvrtko Ursulin
2019-11-19 16:12 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 17:22 ` Chris Wilson
2019-11-19 17:22 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 16/19] drm/i915/selftests: Flush the active callbacks Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 17/19] drm/i915/selftests: Be explicit in ERR_PTR handling Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 18/19] drm/i915/selftests: Exercise rc6 handling Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 19/19] drm/i915/gt: Track engine round-trip times Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:21 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/19] drm/i915/selftests: Force bonded submission to overlap Patchwork
2019-11-18 23:21 ` [Intel-gfx] " Patchwork
2019-11-19 0:04 ` ✓ Fi.CI.BAT: success " Patchwork
2019-11-19 0:04 ` [Intel-gfx] " Patchwork
2019-11-19 9:08 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-11-19 9:08 ` [Intel-gfx] " Patchwork
2019-11-19 19:04 ` ✗ Fi.CI.BUILD: failure for series starting with [01/19] drm/i915/selftests: Force bonded submission to overlap (rev2) Patchwork
2019-11-19 19:04 ` [Intel-gfx] " 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=eab4f23c-821f-850d-d9aa-cc2765754991@linux.intel.com \
--to=tvrtko.ursulin@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;
as well as URLs for NNTP newsgroup(s).