From: Daniel Vetter <daniel@ffwll.ch>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/3] drm/i915: cancel RPS work before disabling RPS
Date: Wed, 24 Apr 2013 11:09:02 +0200 [thread overview]
Message-ID: <20130424090902.GN6169@phenom.ffwll.local> (raw)
In-Reply-To: <1366736968-15227-2-git-send-email-jbarnes@virtuousgeek.org>
On Tue, Apr 23, 2013 at 10:09:27AM -0700, Jesse Barnes wrote:
> Ville noticed this while doing another review; we may as well cancel
> this work just to make sure we don't try anything fancy after disabling
> the RPS interfaces.
>
> Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 93b01e1..72ad817 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3657,6 +3657,7 @@ void intel_disable_gt_powersave(struct drm_device *dev)
> ironlake_disable_rc6(dev);
> } else if (INTEL_INFO(dev)->gen >= 6) {
> cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work);
> + cancel_work_sync(&dev_priv->rps.work);
Module unload is a bit a mess around this area here: We disable irqs too
late, so the work item could easily rearm between the canceling here nad
the disable_rps below. I'll throw a patch on top to remedy that.
-Daniel
> if (IS_VALLEYVIEW(dev))
> cancel_delayed_work_sync(&dev_priv->rps.vlv_work);
> mutex_lock(&dev_priv->rps.hw_lock);
> --
> 1.7.10.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2013-04-24 9:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-23 17:09 [PATCH 1/3] drm/i915: make sure GPU freq drops to minimum after entering RC6 v4 Jesse Barnes
2013-04-23 17:09 ` [PATCH 2/3] drm/i915: cancel RPS work before disabling RPS Jesse Barnes
2013-04-24 9:09 ` Daniel Vetter [this message]
2013-04-23 17:09 ` [PATCH 3/3] drm/i915: create spearate VLV disable_rps function Jesse Barnes
2013-04-24 6:57 ` [PATCH 1/3] drm/i915: make sure GPU freq drops to minimum after entering RC6 v4 Jani Nikula
2013-04-24 9:10 ` Daniel Vetter
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=20130424090902.GN6169@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jbarnes@virtuousgeek.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