From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: Re: [PATCH] drm/i915: IS_GEN6 && IS_GEN7 - is unpossible Date: Sat, 7 Apr 2012 13:58:11 -0700 Message-ID: <20120407135811.2ff0d99d@bwidawsk.net> References: <1333830435-4424-1-git-send-email-ben@bwidawsk.net> <60a83a21-3cdd-4005-9f0c-ede909955bef@email.android.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from cloud01.chad-versace.us (184-106-247-128.static.cloud-ips.com [184.106.247.128]) by gabe.freedesktop.org (Postfix) with ESMTP id 660309E812 for ; Sat, 7 Apr 2012 13:59:34 -0700 (PDT) In-Reply-To: <60a83a21-3cdd-4005-9f0c-ede909955bef@email.android.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org, Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org On Sat, 07 Apr 2012 13:48:30 -0700 Jesse Barnes wrote: > Ben Widawsky wrote: > > >Imagine my surprise when tracking something down, I bisected to a VLV > >commit. > > > >CC: Jesse Barnes > >Signed-off-by: Ben Widawsky > >--- > > 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...`