From: Imre Deak <imre.deak@intel.com>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Intel graphics driver community testing & development
<intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915: Cancel hangcheck before GPU is suspended
Date: Wed, 09 Dec 2015 16:10:03 +0200 [thread overview]
Message-ID: <1449670203.11719.1.camel@intel.com> (raw)
In-Reply-To: <1449669373-8588-1-git-send-email-joonas.lahtinen@linux.intel.com>
On ke, 2015-12-09 at 15:56 +0200, Joonas Lahtinen wrote:
> In order to avoid accessing GPU registers while GPU is suspended
> cancel
> the hangcheck work before calling intel_suspend_complete which
> actually
> puts the GPU to suspend. Otherwise hangcheck might do MMIO reads to a
> suspended GPU.
>
> Placement before intel_guc_suspend is imitated from i915_drm_suspend
> which cancels the work at i915_gem_suspend, to keep the functions
> similar.
>
> On VLV systems, namely BYT, this was causing an error during runtime
> suspend cycle:
>
> [drm:vlv_check_no_gt_access [i915]] *ERROR* GT register access while
> GT waking disabled
>
> Testcase: igt/pm_rpm/basic-rte
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93121
>
> Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
Yep, looks good to me:
Reviewed-by: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c
> b/drivers/gpu/drm/i915/i915_drv.c
> index e6935f1..81862d5 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1462,6 +1462,8 @@ static int intel_runtime_suspend(struct device
> *device)
> i915_gem_release_all_mmaps(dev_priv);
> mutex_unlock(&dev->struct_mutex);
>
> + cancel_delayed_work_sync(&dev_priv-
> >gpu_error.hangcheck_work);
> +
> intel_guc_suspend(dev);
>
> intel_suspend_gt_powersave(dev);
> @@ -1475,7 +1477,6 @@ static int intel_runtime_suspend(struct device
> *device)
> return ret;
> }
>
> - cancel_delayed_work_sync(&dev_priv-
> >gpu_error.hangcheck_work);
> intel_uncore_forcewake_reset(dev, false);
> dev_priv->pm.suspended = true;
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-12-09 14:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 13:56 [PATCH] drm/i915: Cancel hangcheck before GPU is suspended Joonas Lahtinen
2015-12-09 14:10 ` Imre Deak [this message]
2015-12-09 16:19 ` Chris Wilson
2015-12-10 9:32 ` Imre Deak
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=1449670203.11719.1.camel@intel.com \
--to=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=joonas.lahtinen@linux.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