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

[Ben Widawsky]

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

> Ben Widawsky <ben at bwidawsk.net> wrote:
> 
> >Imagine my surprise when tracking something down, I bisected to a VLV
> >commit.
> >
> >CC: Jesse Barnes <jbarnes at virtuousgeek.org>
> >Signed-off-by: Ben Widawsky <benjamin.widawsky at 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...`