From: Chris Wilson Date: Tue, 10 Jun 2014 11:09:29 +0000 (+0100) Subject: drm/i95: Initialize active ring->pid to -1 X-Git-Tag: v3.15.5~77 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=598b7efff633ac2f7bdd9013d9134c7fb19021ed;p=thirdparty%2Fkernel%2Fstable.git drm/i95: Initialize active ring->pid to -1 commit eee73b46261325eb140d899b5371f49b02d88f63 upstream. Otherwise we print out spurious processes on unused rings in the error state. Signed-off-by: Chris Wilson Reviewed-by: Daniel Vetter Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 12f1d43b2d68f..8c7a7d891ff96 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -894,6 +894,8 @@ static void i915_gem_record_rings(struct drm_device *dev, for (i = 0; i < I915_NUM_RINGS; i++) { struct intel_ring_buffer *ring = &dev_priv->ring[i]; + error->ring[i].pid = -1; + if (ring->dev == NULL) continue; @@ -901,7 +903,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