From: Ben Widawsky <ben@bwidawsk.net>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 8/8] drm/i915: enable rc6 on ilk again
Date: Thu, 9 Aug 2012 13:26:12 -0700 [thread overview]
Message-ID: <20120809132612.7fd9c1d8@bwidawsk.net> (raw)
In-Reply-To: <1344461740-1231-9-git-send-email-daniel.vetter@ffwll.ch>
On Wed, 8 Aug 2012 23:35:40 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> I have the faint hope that the total absence of any locking for the
> rps code wasn't too good an idea and could very well have caused some
> rc6 related regressions.
>
> Unfortunately we've never managed to reproduce these issues on any of
> our own machines, so the only way to go about this is to enable it and
> see what happens.
>
> While at it, kill some stale comments and improve the logging.
>
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Ben Widawsky <ben@bwidawsk.net>
After discussing with Daniel on IRC a bit, I've decided it would take
too much time to actually verify the theory. I am acking on the basis
that I also couldn't find the bug report via google, rc6 has worked for
me on ilk forever, and the savings are too big not to try again.
> ---
> drivers/gpu/drm/i915/intel_pm.c | 25 ++++++++++---------------
> 1 file changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index eff0753..a87c625 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2361,31 +2361,26 @@ static void gen6_disable_rps(struct drm_device *dev)
>
> int intel_enable_rc6(const struct drm_device *dev)
> {
> - /*
> - * Respect the kernel parameter if it is set
> - */
> + /* Respect the kernel parameter if it is set */
> if (i915_enable_rc6 >= 0)
> return i915_enable_rc6;
>
> - /*
> - * Disable RC6 on Ironlake
> - */
> - if (INTEL_INFO(dev)->gen == 5)
> - return 0;
> + if (INTEL_INFO(dev)->gen == 5) {
> + DRM_DEBUG_DRIVER("Ironlake: only RC6 available\n");
> + return INTEL_RC6_ENABLE;
> + }
>
> - /* On Haswell, only RC6 is available. So let's enable it by default to
> - * provide better testing and coverage since the beginning.
> - */
> - if (IS_HASWELL(dev))
> + if (IS_HASWELL(dev)) {
> + DRM_DEBUG_DRIVER("Haswell: only RC6 available\n");
> return INTEL_RC6_ENABLE;
> + }
>
> - /*
> - * Disable rc6 on Sandybridge
> - */
> + /* snb/ivb have more than one rc6 state. */
> if (INTEL_INFO(dev)->gen == 6) {
> DRM_DEBUG_DRIVER("Sandybridge: deep RC6 disabled\n");
> return INTEL_RC6_ENABLE;
> }
> +
> DRM_DEBUG_DRIVER("RC6 and deep RC6 enabled\n");
> return (INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE);
> }
--
Ben Widawsky, Intel Open Source Technology Center
next prev parent reply other threads:[~2012-08-09 20:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-08 21:35 [PATCH 0/8] rps locking fixes v2 Daniel Vetter
2012-08-08 21:35 ` [PATCH 1/8] drm/i915: properly guard ilk ips state Daniel Vetter
2012-08-09 14:44 ` [PATCH] " Daniel Vetter
2012-08-08 21:35 ` [PATCH 2/8] drm/i915: fixup up debugfs rps state handling Daniel Vetter
2012-08-09 9:32 ` Chris Wilson
2012-08-09 13:07 ` [PATCH 1/2] " Daniel Vetter
2012-08-09 13:07 ` [PATCH 2/2] drm/i915: use mutex_lock_interruptible for debugfs files Daniel Vetter
2012-08-09 20:18 ` Ben Widawsky
2012-08-08 21:35 ` [PATCH 3/8] drm/i915: move all rps state into dev_priv->rps Daniel Vetter
2012-08-08 21:35 ` [PATCH 4/8] drm/i915: kill dev_priv->mchdev_lock Daniel Vetter
2012-08-08 21:35 ` [PATCH 5/8] drm/i915: DE_PCU_EVENT irq is ilk-only Daniel Vetter
2012-08-08 21:35 ` [PATCH 6/8] drm/i915: fix up ilk drps/ips locking Daniel Vetter
2012-08-09 14:46 ` [PATCH] " Daniel Vetter
2012-08-08 21:35 ` [PATCH 7/8] drm/ips: move drps/ips/ilk related variables into dev_priv->ips Daniel Vetter
2012-08-28 16:14 ` Daniel Vetter
2012-08-08 21:35 ` [PATCH 8/8] drm/i915: enable rc6 on ilk again Daniel Vetter
2012-08-09 20:26 ` Ben Widawsky [this message]
2012-08-09 9:43 ` [PATCH 0/8] rps locking fixes v2 Chris Wilson
2012-08-09 11:48 ` Daniel Vetter
2012-08-09 14:58 ` Lespiau, Damien
2012-08-09 20:36 ` 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=20120809132612.7fd9c1d8@bwidawsk.net \
--to=ben@bwidawsk.net \
--cc=daniel.vetter@ffwll.ch \
--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 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).