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

Commit 4e5aabfd authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Get VECS semaphore info on error 

Ideally we could use for_each_ring with the ring flags as I've done a
couple times
(http://lists.freedesktop.org/archives/intel-gfx/2013-June/029450.html

).
Until Daniel merges that patch though, we can just use this.

Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5020150b

drivers/gpu/drm/i915/i915_gpu_error.c

+11 −0
Original line number Diff line number Diff line
@@ -243,6 +243,11 @@ static void i915_ring_error_state(struct drm_i915_error_state_buf *m, 
		err_printf(m, "  SYNC_1: 0x%08x [last synced 0x%08x]\n",

			   error->semaphore_mboxes[ring][1],

			   error->semaphore_seqno[ring][1]);

		if (HAS_VEBOX(dev)) {

			err_printf(m, "  SYNC_2: 0x%08x [last synced 0x%08x]\n",

				   error->semaphore_mboxes[ring][2],

				   error->semaphore_seqno[ring][2]);

		}

	}

	err_printf(m, "  seqno: 0x%08x\n", error->seqno[ring]);

	err_printf(m, "  waiting: %s\n", yesno(error->waiting[ring]));
@@ -682,6 +687,12 @@ static void i915_record_ring_state(struct drm_device *dev, 
		error->semaphore_seqno[ring->id][1] = ring->sync_seqno[1];

	}



	if (HAS_VEBOX(dev)) {

		error->semaphore_mboxes[ring->id][2] =

			I915_READ(RING_SYNC_2(ring->mmio_base));

		error->semaphore_seqno[ring->id][2] = ring->sync_seqno[2];

	}



	if (INTEL_INFO(dev)->gen >= 4) {

		error->faddr[ring->id] = I915_READ(RING_DMA_FADD(ring->mmio_base));

		error->ipeir[ring->id] = I915_READ(RING_IPEIR(ring->mmio_base));