diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-10 12:09:29 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2014-06-11 11:06:43 +0300 |
| commit | eee73b46261325eb140d899b5371f49b02d88f63 (patch) | |
| tree | e09025f081d921baee6857165752bc6d8cf0fdd5 /drivers/gpu | |
| parent | 2e7eeeb59a92d09144fdb7d2dc1af77a10a7945b (diff) | |
| download | op-kernel-dev-eee73b46261325eb140d899b5371f49b02d88f63.zip op-kernel-dev-eee73b46261325eb140d899b5371f49b02d88f63.tar.gz | |
drm/i95: Initialize active ring->pid to -1
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 87ec60e..66cf417 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 |
