[PATCH] drm/i915: IS_GEN6 && IS_GEN7 - is unpossible

[PATCH] drm/i915: IS_GEN6 && IS_GEN7 - is unpossible

[Ben Widawsky]

Imagine my surprise when tracking something down, I bisected to a VLV commit.

CC: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3abebb5..2ce1763 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9537,7 +9537,7 @@ void intel_modeset_init(struct drm_device *dev)
 		intel_init_emon(dev);
 	}
 
-	if ((IS_GEN6(dev) && IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
+	if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
 		gen6_enable_rps(dev_priv);
 		gen6_update_ring_freq(dev_priv);
 	}
-- 
1.7.10

Re: [PATCH] drm/i915: IS_GEN6 && IS_GEN7 - is unpossible

[Jesse Barnes]

Ben Widawsky <ben@bwidawsk.net> wrote:

>Imagine my surprise when tracking something down, I bisected to a VLV
>commit.
>
>CC: Jesse Barnes <jbarnes@virtuousgeek.org>
>Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
>---
> drivers/gpu/drm/i915/intel_display.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c
>b/drivers/gpu/drm/i915/intel_display.c
>index 3abebb5..2ce1763 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -9537,7 +9537,7 @@ void intel_modeset_init(struct drm_device *dev)
> 		intel_init_emon(dev);
> 	}
> 
>-	if ((IS_GEN6(dev) && IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
>+	if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
> 		gen6_enable_rps(dev_priv);
> 		gen6_update_ring_freq(dev_priv);
> 	}
>-- 
>1.7.10

Daniel caught that one too, maybe he hasn't pushed the fix? 
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [PATCH] drm/i915: IS_GEN6 && IS_GEN7 - is unpossible

[Ben Widawsky]

On Sat, 07 Apr 2012 13:48:30 -0700
Jesse Barnes <jbarnes@virtuousgeek.org> wrote:

> Ben Widawsky <ben@bwidawsk.net> wrote:
> 
> >Imagine my surprise when tracking something down, I bisected to a VLV
> >commit.
> >
> >CC: Jesse Barnes <jbarnes@virtuousgeek.org>
> >Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
> >---
> > drivers/gpu/drm/i915/intel_display.c |    2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >diff --git a/drivers/gpu/drm/i915/intel_display.c
> >b/drivers/gpu/drm/i915/intel_display.c
> >index 3abebb5..2ce1763 100644
> >--- a/drivers/gpu/drm/i915/intel_display.c
> >+++ b/drivers/gpu/drm/i915/intel_display.c
> >@@ -9537,7 +9537,7 @@ void intel_modeset_init(struct drm_device *dev)
> > 		intel_init_emon(dev);
> > 	}
> > 
> >-	if ((IS_GEN6(dev) && IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
> >+	if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
> > 		gen6_enable_rps(dev_priv);
> > 		gen6_update_ring_freq(dev_priv);
> > 	}
> >-- 
> >1.7.10
> 
> Daniel caught that one too, maybe he hasn't pushed the fix? 

Seems it hasn't been pushed, and I missed the exchange about the issue.
As long as it's known already...`

Re: [PATCH] drm/i915: IS_GEN6 && IS_GEN7 - is unpossible

[Daniel Vetter]

On Sat, Apr 07, 2012 at 01:58:11PM -0700, Ben Widawsky wrote:
> On Sat, 07 Apr 2012 13:48:30 -0700
> Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> 
> > Ben Widawsky <ben@bwidawsk.net> wrote:
> > 
> > >Imagine my surprise when tracking something down, I bisected to a VLV
> > >commit.
> > >
> > >CC: Jesse Barnes <jbarnes@virtuousgeek.org>
> > >Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
> > >---
> > > drivers/gpu/drm/i915/intel_display.c |    2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > >diff --git a/drivers/gpu/drm/i915/intel_display.c
> > >b/drivers/gpu/drm/i915/intel_display.c
> > >index 3abebb5..2ce1763 100644
> > >--- a/drivers/gpu/drm/i915/intel_display.c
> > >+++ b/drivers/gpu/drm/i915/intel_display.c
> > >@@ -9537,7 +9537,7 @@ void intel_modeset_init(struct drm_device *dev)
> > > 		intel_init_emon(dev);
> > > 	}
> > > 
> > >-	if ((IS_GEN6(dev) && IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
> > >+	if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
> > > 		gen6_enable_rps(dev_priv);
> > > 		gen6_update_ring_freq(dev_priv);
> > > 	}
> > >-- 
> > >1.7.10
> > 
> > Daniel caught that one too, maybe he hasn't pushed the fix? 
> 
> Seems it hasn't been pushed, and I missed the exchange about the issue.
> As long as it's known already...`

Oh dear, how totally do I suck. And with rc6 disabled by accident on
snb&ivb the QA testing cycle is rather pointless, too.

I'll rip out the broken patch, rebase -testing and -next and ask QA to
re-run any gpu tests. I think modesetting tests shouldn't be affected by
rc6.

Ben, thanks for catching this screw-up.

Yours, Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48

Re: [PATCH] drm/i915: IS_GEN6 && IS_GEN7 - is unpossible

[Jesse Barnes]

[-- Attachment #1.1: Type: text/plain, Size: 2167 bytes --]

On Mon, 9 Apr 2012 18:02:11 +0200
Daniel Vetter <daniel@ffwll.ch> wrote:

> On Sat, Apr 07, 2012 at 01:58:11PM -0700, Ben Widawsky wrote:
> > On Sat, 07 Apr 2012 13:48:30 -0700
> > Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > 
> > > Ben Widawsky <ben@bwidawsk.net> wrote:
> > > 
> > > >Imagine my surprise when tracking something down, I bisected to a VLV
> > > >commit.
> > > >
> > > >CC: Jesse Barnes <jbarnes@virtuousgeek.org>
> > > >Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
> > > >---
> > > > drivers/gpu/drm/i915/intel_display.c |    2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > >diff --git a/drivers/gpu/drm/i915/intel_display.c
> > > >b/drivers/gpu/drm/i915/intel_display.c
> > > >index 3abebb5..2ce1763 100644
> > > >--- a/drivers/gpu/drm/i915/intel_display.c
> > > >+++ b/drivers/gpu/drm/i915/intel_display.c
> > > >@@ -9537,7 +9537,7 @@ void intel_modeset_init(struct drm_device *dev)
> > > > 		intel_init_emon(dev);
> > > > 	}
> > > > 
> > > >-	if ((IS_GEN6(dev) && IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
> > > >+	if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
> > > > 		gen6_enable_rps(dev_priv);
> > > > 		gen6_update_ring_freq(dev_priv);
> > > > 	}
> > > >-- 
> > > >1.7.10
> > > 
> > > Daniel caught that one too, maybe he hasn't pushed the fix? 
> > 
> > Seems it hasn't been pushed, and I missed the exchange about the issue.
> > As long as it's known already...`
> 
> Oh dear, how totally do I suck. And with rc6 disabled by accident on
> snb&ivb the QA testing cycle is rather pointless, too.
> 
> I'll rip out the broken patch, rebase -testing and -next and ask QA to
> re-run any gpu tests. I think modesetting tests shouldn't be affected by
> rc6.
> 
> Ben, thanks for catching this screw-up.

It's my fault, sorry for posting it in the first place!

Daniel, do you need an incremental one to add the VLV check to this
location or do you just want to fix it in-place after reverting the
breakage?  Also is the resume path correct (maybe that's the one you
caught?)?

-- 
Jesse Barnes, Intel Open Source Technology Center

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 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