forked from Minki/linux
f54d186700
I plan to usurp the short name of struct fence for a core kernel struct, and so I need to rename the specialised fence/timeline for DMA operations to make room. A consensus was reached in https://lists.freedesktop.org/archives/dri-devel/2016-July/113083.html that making clear this fence applies to DMA operations was a good thing. Since then the patch has grown a bit as usage increases, so hopefully it remains a good thing! (v2...: rebase, rerun spatch) v3: Compile on msm, spotted a manual fixup that I broke. v4: Try again for msm, sorry Daniel coccinelle script: @@ @@ - struct fence + struct dma_fence @@ @@ - struct fence_ops + struct dma_fence_ops @@ @@ - struct fence_cb + struct dma_fence_cb @@ @@ - struct fence_array + struct dma_fence_array @@ @@ - enum fence_flag_bits + enum dma_fence_flag_bits @@ @@ ( - fence_init + dma_fence_init | - fence_release + dma_fence_release | - fence_free + dma_fence_free | - fence_get + dma_fence_get | - fence_get_rcu + dma_fence_get_rcu | - fence_put + dma_fence_put | - fence_signal + dma_fence_signal | - fence_signal_locked + dma_fence_signal_locked | - fence_default_wait + dma_fence_default_wait | - fence_add_callback + dma_fence_add_callback | - fence_remove_callback + dma_fence_remove_callback | - fence_enable_sw_signaling + dma_fence_enable_sw_signaling | - fence_is_signaled_locked + dma_fence_is_signaled_locked | - fence_is_signaled + dma_fence_is_signaled | - fence_is_later + dma_fence_is_later | - fence_later + dma_fence_later | - fence_wait_timeout + dma_fence_wait_timeout | - fence_wait_any_timeout + dma_fence_wait_any_timeout | - fence_wait + dma_fence_wait | - fence_context_alloc + dma_fence_context_alloc | - fence_array_create + dma_fence_array_create | - to_fence_array + to_dma_fence_array | - fence_is_array + dma_fence_is_array | - trace_fence_emit + trace_dma_fence_emit | - FENCE_TRACE + DMA_FENCE_TRACE | - FENCE_WARN + DMA_FENCE_WARN | - FENCE_ERR + DMA_FENCE_ERR ) ( ... ) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Acked-by: Sumit Semwal <sumit.semwal@linaro.org> Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20161025120045.28839-1-chris@chris-wilson.co.uk
60 lines
1.7 KiB
C
60 lines
1.7 KiB
C
#if !defined(_GPU_SCHED_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _GPU_SCHED_TRACE_H_
|
|
|
|
#include <linux/stringify.h>
|
|
#include <linux/types.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
#include <drm/drmP.h>
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM gpu_sched
|
|
#define TRACE_INCLUDE_FILE gpu_sched_trace
|
|
|
|
TRACE_EVENT(amd_sched_job,
|
|
TP_PROTO(struct amd_sched_job *sched_job),
|
|
TP_ARGS(sched_job),
|
|
TP_STRUCT__entry(
|
|
__field(struct amd_sched_entity *, entity)
|
|
__field(struct amd_sched_job *, sched_job)
|
|
__field(struct dma_fence *, fence)
|
|
__field(const char *, name)
|
|
__field(u32, job_count)
|
|
__field(int, hw_job_count)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->entity = sched_job->s_entity;
|
|
__entry->sched_job = sched_job;
|
|
__entry->fence = &sched_job->s_fence->finished;
|
|
__entry->name = sched_job->sched->name;
|
|
__entry->job_count = kfifo_len(
|
|
&sched_job->s_entity->job_queue) / sizeof(sched_job);
|
|
__entry->hw_job_count = atomic_read(
|
|
&sched_job->sched->hw_rq_count);
|
|
),
|
|
TP_printk("entity=%p, sched job=%p, fence=%p, ring=%s, job count:%u, hw job count:%d",
|
|
__entry->entity, __entry->sched_job, __entry->fence, __entry->name,
|
|
__entry->job_count, __entry->hw_job_count)
|
|
);
|
|
|
|
TRACE_EVENT(amd_sched_process_job,
|
|
TP_PROTO(struct amd_sched_fence *fence),
|
|
TP_ARGS(fence),
|
|
TP_STRUCT__entry(
|
|
__field(struct dma_fence *, fence)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->fence = &fence->finished;
|
|
),
|
|
TP_printk("fence=%p signaled", __entry->fence)
|
|
);
|
|
|
|
#endif
|
|
|
|
/* This part must be outside protection */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
#include <trace/define_trace.h>
|