From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915/guc: Flush the residual log capture after disabling
Date: Thu, 21 Feb 2019 18:24:06 +0200 [thread overview]
Message-ID: <87ef81w1nd.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20190221123252.28550-1-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> After we have marked the log capture as disabled, then flush the log
> capture worker so that it will not re-queue itself.
It is not the worker that re-queues so remove the re-queue part.
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109716
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/intel_guc_log.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c
> index 806fdfd7c78a..020eeac6d228 100644
> --- a/drivers/gpu/drm/i915/intel_guc_log.c
> +++ b/drivers/gpu/drm/i915/intel_guc_log.c
> @@ -241,7 +241,7 @@ static void guc_read_update_log_buffer(struct intel_guc_log *log)
>
> mutex_lock(&log->relay.lock);
>
> - if (WARN_ON(!intel_guc_log_relay_enabled(log)))
> + if (!intel_guc_log_relay_enabled(log))
> goto out_unlock;
>
> /* Get the pointer to shared GuC log buffer */
> @@ -621,13 +621,14 @@ void intel_guc_log_relay_flush(struct intel_guc_log *log)
> void intel_guc_log_relay_close(struct intel_guc_log *log)
> {
> guc_log_disable_flush_events(log);
> - flush_work(&log->relay.flush_work);
>
> mutex_lock(&log->relay.lock);
> GEM_BUG_ON(!intel_guc_log_relay_enabled(log));
> guc_log_unmap(log);
> guc_log_relay_destroy(log);
> mutex_unlock(&log->relay.lock);
> +
> + flush_work(&log->relay.flush_work);
> }
>
> void intel_guc_log_handle_flush_event(struct intel_guc_log *log)
> --
> 2.20.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:[~2019-02-21 16:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-21 12:32 [PATCH] drm/i915/guc: Flush the residual log capture after disabling Chris Wilson
2019-02-21 15:10 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-02-21 16:24 ` Mika Kuoppala [this message]
2019-02-21 16:33 ` [PATCH] " Chris Wilson
2019-02-22 0:27 ` ✓ Fi.CI.IGT: success for " 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=87ef81w1nd.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