From: Daniel Vetter <daniel@ffwll.ch>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Reset RPS events when enabling RPS
Date: Wed, 10 Sep 2014 14:20:56 +0200 [thread overview]
Message-ID: <20140910122056.GS15520@phenom.ffwll.local> (raw)
In-Reply-To: <1410350518-3854-1-git-send-email-chris@chris-wilson.co.uk>
On Wed, Sep 10, 2014 at 01:01:58PM +0100, Chris Wilson wrote:
> After a GPU reset, we reinitialize RPS and RC6 state. (This may be
> unnecessary, they be preserved across the reset anyway...) Given that
> the GPU was active before the reset, it is likely that we do have a
> pending RPS work item and so we should simply disable it rather than
> emit a warn.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This regression has been introduced in
commit dd0a1aa19bd3d7203e58157b84cea78bbac605ac
Author: Jeff McGee <jeff.mcgee@intel.com>
Date: Tue Feb 4 11:32:31 2014 -0600
drm/i915: Restore rps/rc6 on reset
Cc: Jeff McGee <jeff.mcgee@intel.com>
Cc: stable@vger.kernel.org (under the assumption that it blew up in
reality and this isn't just a code audit exercise).
Adding Jeff.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_pm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 9afdeed..3dea174 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3694,7 +3694,7 @@ static void gen8_enable_rps_interrupts(struct drm_device *dev)
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> spin_lock_irq(&dev_priv->irq_lock);
> - WARN_ON(dev_priv->rps.pm_iir);
> + dev_priv->rps.pm_iir = 0;
> gen8_enable_pm_irq(dev_priv, dev_priv->rps.pm_events);
> I915_WRITE(GEN8_GT_IIR(2), dev_priv->rps.pm_events);
> spin_unlock_irq(&dev_priv->irq_lock);
> @@ -3705,7 +3705,7 @@ static void gen6_enable_rps_interrupts(struct drm_device *dev)
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> spin_lock_irq(&dev_priv->irq_lock);
> - WARN_ON(dev_priv->rps.pm_iir);
> + dev_priv->rps.pm_iir = 0;
> gen6_enable_pm_irq(dev_priv, dev_priv->rps.pm_events);
> I915_WRITE(GEN6_PMIIR, dev_priv->rps.pm_events);
> spin_unlock_irq(&dev_priv->irq_lock);
> --
> 1.9.1
>
> _______________________________________________
> 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:[~2014-09-10 12:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-10 12:01 [PATCH] drm/i915: Reset RPS events when enabling RPS Chris Wilson
2014-09-10 12:20 ` Daniel Vetter [this message]
2015-01-21 19:23 ` Jani Nikula
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=20140910122056.GS15520@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--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.