Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eee73b46 authored by Chris Wilson's avatar Chris Wilson Committed by Jani Nikula
Browse files

drm/i95: Initialize active ring->pid to -1 



Otherwise we print out spurious processes on unused rings in the error
state.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 2e7eeeb5

drivers/gpu/drm/i915/i915_gpu_error.c

+2 −1
Original line number Diff line number Diff line
@@ -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