From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 25/25] drm/i915: don't write ring regs until they're set up Date: Wed, 21 Mar 2012 22:46:41 +0100 Message-ID: <20120321214641.GP9913@phenom.ffwll.local> References: <1332359326-15051-1-git-send-email-jbarnes@virtuousgeek.org> <1332359326-15051-26-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id A81E1A0CB9 for ; Wed, 21 Mar 2012 14:45:57 -0700 (PDT) Received: by wibhj13 with SMTP id hj13so5363809wib.12 for ; Wed, 21 Mar 2012 14:45:56 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1332359326-15051-26-git-send-email-jbarnes@virtuousgeek.org> 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 List-Id: intel-gfx@lists.freedesktop.org On Wed, Mar 21, 2012 at 12:48:46PM -0700, Jesse Barnes wrote: > intel_clear_scanline_wait tries to clear ring wait conditions when we > turn off pipes, to prevent hanging WAIT_EVENT and similar commands. But > we call it early before rings have been setup during initialization and > shouldn't touch the ring regs yet. > > Signed-off-by: Jesse Barnes Just a curious question: Does vlv not like this and blow up or is this just something that poped up in register trace/code reviewing? -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index dc0ef17..1a8cb30 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3098,6 +3098,10 @@ static void intel_clear_scanline_wait(struct drm_device *dev) > > ring = LP_RING(dev_priv); > > + /* This may be called before rings are initialized */ > + if (!ring->mmio_base) > + return; > + > tmp = I915_READ_CTL(ring); > if (tmp & RING_WAIT) > I915_WRITE_CTL(ring, tmp); > -- > 1.7.5.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48