drm/i915/gt: Add some debug tracing for context pinning (cba17e5d) · Commits · 戴 / test

drivers/gpu/drm/i915/gt/intel_context.c

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -59,6 +59,10 @@ int __intel_context_do_pin(struct intel_context *ce)
	if (err)		if (err)
	goto err;		goto err;

			GEM_TRACE("%s context:%llx pin ring:{head:%04x, tail:%04x}\n",
			ce->engine->name, ce->ring->timeline->fence_context,
			ce->ring->head, ce->ring->tail);

	i915_gem_context_get(ce->gem_context); /* for ctx->ppgtt */		i915_gem_context_get(ce->gem_context); /* for ctx->ppgtt */

	smp_mb__before_atomic(); /* flush pin before it is visible */		smp_mb__before_atomic(); /* flush pin before it is visible */
	@@ -85,6 +89,9 @@ void intel_context_unpin(struct intel_context *ce)
	mutex_lock_nested(&ce->pin_mutex, SINGLE_DEPTH_NESTING);		mutex_lock_nested(&ce->pin_mutex, SINGLE_DEPTH_NESTING);

	if (likely(atomic_dec_and_test(&ce->pin_count))) {		if (likely(atomic_dec_and_test(&ce->pin_count))) {
			GEM_TRACE("%s context:%llx retire\n",
			ce->engine->name, ce->ring->timeline->fence_context);

	ce->ops->unpin(ce);		ce->ops->unpin(ce);

	i915_gem_context_put(ce->gem_context);		i915_gem_context_put(ce->gem_context);
	@@ -127,6 +134,9 @@ static void __intel_context_retire(struct i915_active *active)
	{		{
	struct intel_context ce = container_of(active, typeof(ce), active);		struct intel_context ce = container_of(active, typeof(ce), active);

			GEM_TRACE("%s context:%llx retire\n",
			ce->engine->name, ce->ring->timeline->fence_context);

	if (ce->state)		if (ce->state)
	__context_unpin_state(ce->state);		__context_unpin_state(ce->state);

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1197,6 +1197,7 @@ int intel_ring_pin(struct intel_ring *ring)
	GEM_BUG_ON(ring->vaddr);		GEM_BUG_ON(ring->vaddr);
	ring->vaddr = addr;		ring->vaddr = addr;

			GEM_TRACE("ring:%llx pin\n", ring->timeline->fence_context);
	return 0;		return 0;

	err_ring:		err_ring:
	@@ -1223,6 +1224,8 @@ void intel_ring_unpin(struct intel_ring *ring)
	if (!atomic_dec_and_test(&ring->pin_count))		if (!atomic_dec_and_test(&ring->pin_count))
	return;		return;

			GEM_TRACE("ring:%llx unpin\n", ring->timeline->fence_context);

	/* Discard any unused bytes beyond that submitted to hw. */		/* Discard any unused bytes beyond that submitted to hw. */
	intel_ring_reset(ring, ring->tail);		intel_ring_reset(ring, ring->tail);