From: Kenneth Graunke <kenneth@whitecape.org>
To: Eric Anholt <eric@anholt.net>
Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org
Subject: Re: [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
Date: Tue, 24 Jan 2012 10:28:41 -0800 [thread overview]
Message-ID: <4F1EF859.7020003@whitecape.org> (raw)
In-Reply-To: <1327364046-20840-2-git-send-email-eric@anholt.net>
On 01/23/2012 04:14 PM, Eric Anholt wrote:
> Signed-off-by: Eric Anholt<eric@anholt.net>
> Cc: stable@vger.kernel.org
> ---
> drivers/gpu/drm/i915/i915_suspend.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
> index 30d924f..2b5eb22 100644
> --- a/drivers/gpu/drm/i915/i915_suspend.c
> +++ b/drivers/gpu/drm/i915/i915_suspend.c
> @@ -827,7 +827,7 @@ int i915_save_state(struct drm_device *dev)
>
> if (IS_IRONLAKE_M(dev))
> ironlake_disable_drps(dev);
> - if (IS_GEN6(dev))
> + if (INTEL_INFO(dev)->gen>= 6)
> gen6_disable_rps(dev);
>
> /* Cache mode state */
> @@ -886,7 +886,7 @@ int i915_restore_state(struct drm_device *dev)
> intel_init_emon(dev);
> }
>
> - if (IS_GEN6(dev)) {
> + if (INTEL_INFO(dev)->gen>= 6) {
> gen6_enable_rps(dev_priv);
> gen6_update_ring_freq(dev_priv);
> }
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
next prev parent reply other threads:[~2012-01-24 18:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-24 0:14 [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e Eric Anholt
2012-01-24 0:14 ` [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume Eric Anholt
2012-01-24 1:52 ` Keith Packard
2012-01-24 18:11 ` Eric Anholt
2012-01-24 14:41 ` Eugeni Dodonov
2012-01-24 18:28 ` Kenneth Graunke [this message]
2012-01-24 21:32 ` Keith Packard
2012-01-24 1:45 ` [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e Keith Packard
2012-01-24 3:45 ` Ben Widawsky
2012-01-24 14:41 ` Eugeni Dodonov
2012-01-24 18:28 ` Kenneth Graunke
2012-01-24 21:32 ` Keith Packard
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=4F1EF859.7020003@whitecape.org \
--to=kenneth@whitecape.org \
--cc=eric@anholt.net \
--cc=intel-gfx@lists.freedesktop.org \
--cc=stable@vger.kernel.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