From: Daniel Vetter <daniel@ffwll.ch>
To: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>,
"Michał Winiarski" <michal.winiarski@intel.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Mark GPU wedging on driver unregister unrecoverable
Date: Thu, 2 Sep 2021 21:56:58 +0200 [thread overview]
Message-ID: <CAKMK7uHwpbdu-fa8C3TRoLJhja8zn-5D75CoEuJyEdA1iTCFpA@mail.gmail.com> (raw)
In-Reply-To: <20210901151415.177556-1-janusz.krzysztofik@linux.intel.com>
On Wed, Sep 1, 2021 at 5:15 PM Janusz Krzysztofik
<janusz.krzysztofik@linux.intel.com> wrote:
>
> GPU wedged flag now set on driver unregister to prevent from further
> using the GPU can be then cleared unintentionally when calling
> __intel_gt_unset_wedged() still before the flag is finally marked
> unrecoverable. We need to have it marked unrecoverable earlier.
> Implement that by replacing a call to intel_gt_set_wedged() in
> intel_gt_driver_unregister() with intel_gt_set_wedged_on_fini().
>
> With the above in place, intel_gt_set_wedged_on_fini() is now called
> twice on driver remove, second time from __intel_gt_disable(). This
> seems harmless, while dropping intel_gt_set_wedged_on_fini() from
> __intel_gt_disable() proved to break some driver probe error unwind
> paths as well as mock selftest exit path.
>
> Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
> Cc: Michał Winiarski <michal.winiarski@intel.com>
All gt/core/gem patches must cc: dri-devel. Please resend, plus
anything else that matches, and please share in your team apparently
the memo didnt get through (this is the process since half a year
now).
-Daniel
> ---
> drivers/gpu/drm/i915/gt/intel_gt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
> index 62d40c986642..173b53cb2b47 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt.c
> @@ -750,7 +750,7 @@ void intel_gt_driver_unregister(struct intel_gt *gt)
> * all in-flight requests so that we can quickly unbind the active
> * resources.
> */
> - intel_gt_set_wedged(gt);
> + intel_gt_set_wedged_on_fini(gt);
>
> /* Scrub all HW state upon release */
> with_intel_runtime_pm(gt->uncore->rpm, wakeref)
> --
> 2.25.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
prev parent reply other threads:[~2021-09-02 19:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 15:14 [Intel-gfx] [PATCH] drm/i915: Mark GPU wedging on driver unregister unrecoverable Janusz Krzysztofik
2021-09-01 17:22 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-09-01 19:48 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-09-02 19:56 ` Daniel Vetter [this message]
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=CAKMK7uHwpbdu-fa8C3TRoLJhja8zn-5D75CoEuJyEdA1iTCFpA@mail.gmail.com \
--to=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=janusz.krzysztofik@linux.intel.com \
--cc=michal.winiarski@intel.com \
/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).