* [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
2012-01-24 0:14 [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e Eric Anholt
@ 2012-01-24 0:14 ` Eric Anholt
2012-01-24 1:52 ` Keith Packard
` (3 more replies)
2012-01-24 1:45 ` [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e Keith Packard
` (4 subsequent siblings)
5 siblings, 4 replies; 12+ messages in thread
From: Eric Anholt @ 2012-01-24 0:14 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
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);
}
--
1.7.7.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
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
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: Keith Packard @ 2012-01-24 1:52 UTC (permalink / raw)
To: Eric Anholt, intel-gfx; +Cc: stable
[-- Attachment #1.1: Type: text/plain, Size: 1060 bytes --]
On Mon, 23 Jan 2012 16:14:06 -0800, Eric Anholt <eric@anholt.net> wrote:
> 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);
> }
I fear we'll continue to find stuff like this...
I just reviewed all of the IS_GEN6 calls and found that
i915_forcewake_open/i915_forcewake_release only work on
GEN6; I assume these are supposed to work on GEN6 and after, so a test
like the above might be appropriate?
I didn't see much else, although there are some suspicious bits in
i915_debugfs.c that could probably use review.
In any case, the above patch is
Reviewed-by: Keith Packard <keithp@keithp.com>
and I will merge it into -fixes
--
keith.packard@intel.com
[-- Attachment #1.2: Type: application/pgp-signature, Size: 827 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
2012-01-24 1:52 ` Keith Packard
@ 2012-01-24 18:11 ` Eric Anholt
0 siblings, 0 replies; 12+ messages in thread
From: Eric Anholt @ 2012-01-24 18:11 UTC (permalink / raw)
To: Keith Packard, intel-gfx; +Cc: stable
[-- Attachment #1.1: Type: text/plain, Size: 969 bytes --]
On Mon, 23 Jan 2012 17:52:10 -0800, Keith Packard <keithp@keithp.com> wrote:
> On Mon, 23 Jan 2012 16:14:06 -0800, Eric Anholt <eric@anholt.net> wrote:
>
> > 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);
> > }
>
> I fear we'll continue to find stuff like this...
>
> I just reviewed all of the IS_GEN6 calls and found that
> i915_forcewake_open/i915_forcewake_release only work on
> GEN6; I assume these are supposed to work on GEN6 and after, so a test
> like the above might be appropriate?
Oh, so that's why the tools didn't work. Sigh.
[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
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 14:41 ` Eugeni Dodonov
2012-01-24 18:28 ` Kenneth Graunke
2012-01-24 21:32 ` Keith Packard
3 siblings, 0 replies; 12+ messages in thread
From: Eugeni Dodonov @ 2012-01-24 14:41 UTC (permalink / raw)
To: Eric Anholt; +Cc: intel-gfx, stable
[-- Attachment #1.1: Type: text/plain, Size: 251 bytes --]
On Mon, Jan 23, 2012 at 22:14, Eric Anholt <eric@anholt.net> wrote:
> Signed-off-by: Eric Anholt <eric@anholt.net>
> Cc: stable@vger.kernel.org
>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
--
Eugeni Dodonov
<http://eugeni.dodonov.net/>
[-- Attachment #1.2: Type: text/html, Size: 671 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
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 14:41 ` Eugeni Dodonov
@ 2012-01-24 18:28 ` Kenneth Graunke
2012-01-24 21:32 ` Keith Packard
3 siblings, 0 replies; 12+ messages in thread
From: Kenneth Graunke @ 2012-01-24 18:28 UTC (permalink / raw)
To: Eric Anholt; +Cc: intel-gfx, stable
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>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
2012-01-24 0:14 ` [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume Eric Anholt
` (2 preceding siblings ...)
2012-01-24 18:28 ` Kenneth Graunke
@ 2012-01-24 21:32 ` Keith Packard
3 siblings, 0 replies; 12+ messages in thread
From: Keith Packard @ 2012-01-24 21:32 UTC (permalink / raw)
To: Eric Anholt, intel-gfx; +Cc: stable
[-- Attachment #1.1: Type: text/plain, Size: 226 bytes --]
On Mon, 23 Jan 2012 16:14:06 -0800, Eric Anholt <eric@anholt.net> wrote:
> Signed-off-by: Eric Anholt <eric@anholt.net>
> Cc: stable@vger.kernel.org
I've applied this to drm-intel-fixes
--
keith.packard@intel.com
[-- Attachment #1.2: Type: application/pgp-signature, Size: 827 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e.
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:45 ` Keith Packard
2012-01-24 3:45 ` Ben Widawsky
` (3 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Keith Packard @ 2012-01-24 1:45 UTC (permalink / raw)
To: Eric Anholt, intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 459 bytes --]
On Mon, 23 Jan 2012 16:14:05 -0800, Eric Anholt <eric@anholt.net> wrote:
> seq_printf(m, "SW control enabled: %s\n",
> yesno((rpmodectl1 & GEN6_RP_MEDIA_MODE_MASK) ==
> GEN6_RP_MEDIA_SW_MODE));
> - seq_printf(m, "RC6 Enabled: %s\n",
> + seq_printf(m, "RC1e Enabled: %s\n",
> yesno(rcctl1 & GEN6_RC_CTL_RC1e_ENABLE));
Reviewed-by: Keith Packard <keithp@keithp.com>
(I'll stick this in -fixes)
--
keith.packard@intel.com
[-- Attachment #1.2: Type: application/pgp-signature, Size: 827 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e.
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: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
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Ben Widawsky @ 2012-01-24 3:45 UTC (permalink / raw)
To: Eric Anholt; +Cc: intel-gfx
On 01/23/12 16:14, Eric Anholt wrote:
> We had two things in a row claiming to be RC6.
>
> Signed-off-by: Eric Anholt<eric@anholt.net>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e.
2012-01-24 0:14 [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e Eric Anholt
` (2 preceding siblings ...)
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
5 siblings, 0 replies; 12+ messages in thread
From: Eugeni Dodonov @ 2012-01-24 14:41 UTC (permalink / raw)
To: Eric Anholt; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 226 bytes --]
On Mon, Jan 23, 2012 at 22:14, Eric Anholt <eric@anholt.net> wrote:
> We had two things in a row claiming to be RC6.
>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
--
Eugeni Dodonov
<http://eugeni.dodonov.net/>
[-- Attachment #1.2: Type: text/html, Size: 559 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e.
2012-01-24 0:14 [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e Eric Anholt
` (3 preceding siblings ...)
2012-01-24 14:41 ` Eugeni Dodonov
@ 2012-01-24 18:28 ` Kenneth Graunke
2012-01-24 21:32 ` Keith Packard
5 siblings, 0 replies; 12+ messages in thread
From: Kenneth Graunke @ 2012-01-24 18:28 UTC (permalink / raw)
To: Eric Anholt; +Cc: intel-gfx
On 01/23/2012 04:14 PM, Eric Anholt wrote:
> We had two things in a row claiming to be RC6.
>
> Signed-off-by: Eric Anholt<eric@anholt.net>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index a017b98..60dcee3 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -1106,7 +1106,7 @@ static int gen6_drpc_info(struct seq_file *m)
> seq_printf(m, "SW control enabled: %s\n",
> yesno((rpmodectl1& GEN6_RP_MEDIA_MODE_MASK) ==
> GEN6_RP_MEDIA_SW_MODE));
> - seq_printf(m, "RC6 Enabled: %s\n",
> + seq_printf(m, "RC1e Enabled: %s\n",
> yesno(rcctl1& GEN6_RC_CTL_RC1e_ENABLE));
> seq_printf(m, "RC6 Enabled: %s\n",
> yesno(rcctl1& GEN6_RC_CTL_RC6_ENABLE));
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e.
2012-01-24 0:14 [PATCH 1/2] drm/i915: Correct debugfs printout for RC1e Eric Anholt
` (4 preceding siblings ...)
2012-01-24 18:28 ` Kenneth Graunke
@ 2012-01-24 21:32 ` Keith Packard
5 siblings, 0 replies; 12+ messages in thread
From: Keith Packard @ 2012-01-24 21:32 UTC (permalink / raw)
To: Eric Anholt, intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 198 bytes --]
On Mon, 23 Jan 2012 16:14:05 -0800, Eric Anholt <eric@anholt.net> wrote:
> We had two things in a row claiming to be RC6.
I've applied this to drm-intel-fixes
--
keith.packard@intel.com
[-- Attachment #1.2: Type: application/pgp-signature, Size: 827 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread