From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Disable RPM wakeref assertions during driver shutdown
Date: Fri, 8 Jan 2021 20:01:33 +0200 [thread overview]
Message-ID: <X/id/brG1KiFYV4q@intel.com> (raw)
In-Reply-To: <20210104203905.19248-1-chris@chris-wilson.co.uk>
On Mon, Jan 04, 2021 at 08:39:05PM +0000, Chris Wilson wrote:
> As with the regular suspend paths, also disable the wakeref assertions
> as we disable the driver during shutdown.
>
> Reported-by: Hans de Goede <hdegoede@redhat.com>
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2899
> Fixes: fe0f1e3bfdfe ("drm/i915: Shut down displays gracefully on reboot")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Hans de Goede <hdegoede@redhat.com>
lgtm
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 249f765993f7..643a899b3b44 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1046,6 +1046,8 @@ static void intel_shutdown_encoders(struct drm_i915_private *dev_priv)
>
> void i915_driver_shutdown(struct drm_i915_private *i915)
> {
> + disable_rpm_wakeref_asserts(&i915->runtime_pm);
> +
> i915_gem_suspend(i915);
>
> drm_kms_helper_poll_disable(&i915->drm);
> @@ -1059,6 +1061,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
>
> intel_suspend_encoders(i915);
> intel_shutdown_encoders(i915);
> +
> + enable_rpm_wakeref_asserts(&i915->runtime_pm);
> }
>
> static bool suspend_to_idle(struct drm_i915_private *dev_priv)
> --
> 2.20.1
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2021-01-08 18:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-04 20:39 [Intel-gfx] [PATCH] drm/i915: Disable RPM wakeref assertions during driver shutdown Chris Wilson
2021-01-04 22:21 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-01-05 0:09 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-01-05 15:25 ` [Intel-gfx] [PATCH] " Hans de Goede
2021-01-08 21:32 ` Chris Wilson
2021-01-08 18:01 ` Ville Syrjälä [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=X/id/brG1KiFYV4q@intel.com \
--to=ville.syrjala@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.