From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH] drm/i915: don't clobber the pipe param in sanitize_modesetting Date: Sun, 13 May 2012 21:12:28 +0100 Message-ID: <1336939976_9843@CP5-2952> References: <1336939694-3376-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id 53BED9E76E for ; Sun, 13 May 2012 13:13:06 -0700 (PDT) In-Reply-To: <1336939694-3376-1-git-send-email-daniel.vetter@ffwll.ch> 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: Intel Graphics Development Cc: Daniel Vetter , "the regression was Cc: stable, too" List-Id: intel-gfx@lists.freedesktop.org On Sun, 13 May 2012 22:08:14 +0200, Daniel Vetter wrote: > ... we need it later on in the function to clean up pipe <-> plane > associations. This regression has been introduced in > > commit f47166d2b0001fcb752b40c5a2d4db986dfbea68 > Author: Chris Wilson > Date: Thu Mar 22 15:00:50 2012 +0000 > > drm/i915: Sanitize BIOS debugging bits from PIPECONF > > Spotted by staring at debug output of an (as it turns out) totally > unrelated bug. > > Cc: Chris Wilson > Cc: stable@kernel.org (the regression was Cc: stable, too) > Signed-Off-by: Daniel Vetter Note this will also explain some of the bogosity with https://bugs.freedesktop.org/show_bug.cgi?id=49838 on dinq. > --- > drivers/gpu/drm/i915/intel_display.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index fb05d9d..525dc65 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -6257,9 +6257,10 @@ static void intel_sanitize_modesetting(struct drm_device *dev, > { > struct drm_i915_private *dev_priv = dev->dev_private; > u32 reg, val; > + int i; > > /* Clear any frame start delays used for debugging left by the BIOS */ > - for_each_pipe(pipe) { > + for_each_pipe(i) { > reg = PIPECONF(pipe); s/pipe/i/ -Chris -- Chris Wilson, Intel Open Source Technology Centre