From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i95: Initialize active ring->pid to -1 Date: Tue, 10 Jun 2014 15:30:25 +0200 Message-ID: <20140610133025.GM5821@phenom.ffwll.local> References: <1402398569-8414-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C0396E698 for ; Tue, 10 Jun 2014 06:30:31 -0700 (PDT) Received: by mail-wi0-f170.google.com with SMTP id cc10so1647748wib.1 for ; Tue, 10 Jun 2014 06:30:30 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1402398569-8414-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Jun 10, 2014 at 12:09:29PM +0100, Chris Wilson wrote: > Otherwise we print out spurious processes on unused rings in the error > state. > > Signed-off-by: Chris Wilson > Cc: stable@vger.kernel.org Personally would have done that in the dumper code, not the recording code - this here looks a bit inconsistent. Either way this is Reviewed-by: Daniel Vetter > --- > drivers/gpu/drm/i915/i915_gpu_error.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > index 87ec60e181a7..66cf41765bf9 100644 > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > @@ -888,6 +888,8 @@ static void i915_gem_record_rings(struct drm_device *dev, > for (i = 0; i < I915_NUM_RINGS; i++) { > struct intel_engine_cs *ring = &dev_priv->ring[i]; > > + error->ring[i].pid = -1; > + > if (ring->dev == NULL) > continue; > > @@ -895,7 +897,6 @@ static void i915_gem_record_rings(struct drm_device *dev, > > i915_record_ring_state(dev, ring, &error->ring[i]); > > - error->ring[i].pid = -1; > request = i915_gem_find_active_request(ring); > if (request) { > /* We need to copy these to an anonymous buffer > -- > 2.0.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch