From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [Intel-gfx] [PATCH] drm/i95: Initialize active ring->pid to -1 Date: Tue, 10 Jun 2014 19:39:02 +0300 Message-ID: <8761k8u3bt.fsf@intel.com> References: <1402398569-8414-1-git-send-email-chris@chris-wilson.co.uk> <20140610133025.GM5821@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <20140610133025.GM5821@phenom.ffwll.local> Sender: stable-owner@vger.kernel.org To: Daniel Vetter , Chris Wilson Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org On Tue, 10 Jun 2014, Daniel Vetter wrote: > 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 Pushed to -fixes, thanks for the patch and review. BR, Jani. >> --- >> 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 > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center