Skip to content

Commit

Permalink
drm/i95: Initialize active ring->pid to -1
Browse files Browse the repository at this point in the history
Otherwise we print out spurious processes on unused rings in the error
state.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
  • Loading branch information
Chris Wilson authored and Jani Nikula committed Jun 11, 2014
1 parent 2e7eeeb commit eee73b4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/i915_gpu_error.c
Original file line number Diff line number Diff line change
Expand Up @@ -888,14 +888,15 @@ 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;

error->ring[i].valid = true;

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
Expand Down

0 comments on commit eee73b4

Please sign in to comment.