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

Commit 1d784167 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: add ring to fence trace functions 



Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 31dd8d93

drivers/gpu/drm/radeon/radeon_fence.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ int radeon_fence_emit(struct radeon_device *rdev, 
	(*fence)->seq = ++rdev->fence_drv[ring].sync_seq[ring];

	(*fence)->seq = ++rdev->fence_drv[ring].sync_seq[ring];

	(*fence)->ring = ring;

	(*fence)->ring = ring;

	radeon_fence_ring_emit(rdev, ring, *fence);

	radeon_fence_ring_emit(rdev, ring, *fence);

	trace_radeon_fence_emit(rdev->ddev, (*fence)->seq);

	trace_radeon_fence_emit(rdev->ddev, ring, (*fence)->seq);

	return 0;

	return 0;

}

}
@@ -313,7 +313,7 @@ static int radeon_fence_wait_seq(struct radeon_device *rdev, u64 *target_seq, 
				continue;

				continue;





			last_seq[i] = atomic64_read(&rdev->fence_drv[i].last_seq);

			last_seq[i] = atomic64_read(&rdev->fence_drv[i].last_seq);

			trace_radeon_fence_wait_begin(rdev->ddev, target_seq[i]);

			trace_radeon_fence_wait_begin(rdev->ddev, i, target_seq[i]);

			radeon_irq_kms_sw_irq_get(rdev, i);

			radeon_irq_kms_sw_irq_get(rdev, i);

		}

		}
@@ -332,7 +332,7 @@ static int radeon_fence_wait_seq(struct radeon_device *rdev, u64 *target_seq, 
				continue;

				continue;





			radeon_irq_kms_sw_irq_put(rdev, i);

			radeon_irq_kms_sw_irq_put(rdev, i);

			trace_radeon_fence_wait_end(rdev->ddev, target_seq[i]);

			trace_radeon_fence_wait_end(rdev->ddev, i, target_seq[i]);

		}

		}





		if (unlikely(r < 0))

		if (unlikely(r < 0))

drivers/gpu/drm/radeon/radeon_trace.h

+12 −9
Original line number Original line Diff line number Diff line
@@ -106,42 +106,45 @@ TRACE_EVENT(radeon_vm_set_page, 




DECLARE_EVENT_CLASS(radeon_fence_request,

DECLARE_EVENT_CLASS(radeon_fence_request,





	    TP_PROTO(struct drm_device *dev, u32 seqno),

	    TP_PROTO(struct drm_device *dev, int ring, u32 seqno),





	    TP_ARGS(dev, seqno),

	    TP_ARGS(dev, ring, seqno),





	    TP_STRUCT__entry(

	    TP_STRUCT__entry(

			     __field(u32, dev)

			     __field(u32, dev)

			     __field(int, ring)

			     __field(u32, seqno)

			     __field(u32, seqno)

			     ),

			     ),





	    TP_fast_assign(

	    TP_fast_assign(

			   __entry->dev = dev->primary->index;

			   __entry->dev = dev->primary->index;

			   __entry->ring = ring;

			   __entry->seqno = seqno;

			   __entry->seqno = seqno;

			   ),

			   ),





	    TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)

	    TP_printk("dev=%u, ring=%d, seqno=%u",

		      __entry->dev, __entry->ring, __entry->seqno)

);

);





DEFINE_EVENT(radeon_fence_request, radeon_fence_emit,

DEFINE_EVENT(radeon_fence_request, radeon_fence_emit,





	    TP_PROTO(struct drm_device *dev, u32 seqno),

	    TP_PROTO(struct drm_device *dev, int ring, u32 seqno),





	    TP_ARGS(dev, seqno)

	    TP_ARGS(dev, ring, seqno)

);

);





DEFINE_EVENT(radeon_fence_request, radeon_fence_wait_begin,

DEFINE_EVENT(radeon_fence_request, radeon_fence_wait_begin,





	    TP_PROTO(struct drm_device *dev, u32 seqno),

	    TP_PROTO(struct drm_device *dev, int ring, u32 seqno),





	    TP_ARGS(dev, seqno)

	    TP_ARGS(dev, ring, seqno)

);

);





DEFINE_EVENT(radeon_fence_request, radeon_fence_wait_end,

DEFINE_EVENT(radeon_fence_request, radeon_fence_wait_end,





	    TP_PROTO(struct drm_device *dev, u32 seqno),

	    TP_PROTO(struct drm_device *dev, int ring, u32 seqno),





	    TP_ARGS(dev, seqno)

	    TP_ARGS(dev, ring, seqno)

);

);





DECLARE_EVENT_CLASS(radeon_semaphore_request,

DECLARE_EVENT_CLASS(radeon_semaphore_request,