Merge tag 'drm-misc-next-2024-12-05' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
[airlied: handle module ns conflict]
drm-misc-next for 6.14:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- Remove driver date from drm_driver
Driver Changes:
- amdxdna: New driver!
- ivpu: Fix qemu crash when using passthrough
- nouveau: expose GSP-RM logging buffers via debugfs
- panfrost: Add MT8188 Mali-G57 MC3 support
- panthor: misc improvements,
- rockchip: Gamma LUT support
- tidss: Misc improvements
- virtio: convert to helpers, add prime support for scanout buffers
- v3d: Add DRM_IOCTL_V3D_PERFMON_SET_GLOBAL
- vc4: Add support for BCM2712
- vkms: Improvements all across the board
- panels:
- Introduce backlight quirks infrastructure
- New panels: KDB KD116N2130B12
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241205-agile-straight-pegasus-aca7f4@houat
This commit is contained in:
@@ -0,0 +1,101 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* Copyright (C) 2023-2024, Advanced Micro Devices, Inc.
|
||||
*/
|
||||
|
||||
#undef TRACE_SYSTEM
|
||||
#define TRACE_SYSTEM amdxdna
|
||||
|
||||
#if !defined(_TRACE_AMDXDNA_H) || defined(TRACE_HEADER_MULTI_READ)
|
||||
#define _TRACE_AMDXDNA_H
|
||||
|
||||
#include <drm/gpu_scheduler.h>
|
||||
#include <linux/tracepoint.h>
|
||||
|
||||
TRACE_EVENT(amdxdna_debug_point,
|
||||
TP_PROTO(const char *name, u64 number, const char *str),
|
||||
|
||||
TP_ARGS(name, number, str),
|
||||
|
||||
TP_STRUCT__entry(__string(name, name)
|
||||
__field(u64, number)
|
||||
__string(str, str)),
|
||||
|
||||
TP_fast_assign(__assign_str(name);
|
||||
__entry->number = number;
|
||||
__assign_str(str);),
|
||||
|
||||
TP_printk("%s:%llu %s", __get_str(name), __entry->number,
|
||||
__get_str(str))
|
||||
);
|
||||
|
||||
TRACE_EVENT(xdna_job,
|
||||
TP_PROTO(struct drm_sched_job *sched_job, const char *name, const char *str, u64 seq),
|
||||
|
||||
TP_ARGS(sched_job, name, str, seq),
|
||||
|
||||
TP_STRUCT__entry(__string(name, name)
|
||||
__string(str, str)
|
||||
__field(u64, fence_context)
|
||||
__field(u64, fence_seqno)
|
||||
__field(u64, seq)),
|
||||
|
||||
TP_fast_assign(__assign_str(name);
|
||||
__assign_str(str);
|
||||
__entry->fence_context = sched_job->s_fence->finished.context;
|
||||
__entry->fence_seqno = sched_job->s_fence->finished.seqno;
|
||||
__entry->seq = seq;),
|
||||
|
||||
TP_printk("fence=(context:%llu, seqno:%lld), %s seq#:%lld %s",
|
||||
__entry->fence_context, __entry->fence_seqno,
|
||||
__get_str(name), __entry->seq,
|
||||
__get_str(str))
|
||||
);
|
||||
|
||||
DECLARE_EVENT_CLASS(xdna_mbox_msg,
|
||||
TP_PROTO(char *name, u8 chann_id, u32 opcode, u32 msg_id),
|
||||
|
||||
TP_ARGS(name, chann_id, opcode, msg_id),
|
||||
|
||||
TP_STRUCT__entry(__string(name, name)
|
||||
__field(u32, chann_id)
|
||||
__field(u32, opcode)
|
||||
__field(u32, msg_id)),
|
||||
|
||||
TP_fast_assign(__assign_str(name);
|
||||
__entry->chann_id = chann_id;
|
||||
__entry->opcode = opcode;
|
||||
__entry->msg_id = msg_id;),
|
||||
|
||||
TP_printk("%s.%d id 0x%x opcode 0x%x", __get_str(name),
|
||||
__entry->chann_id, __entry->msg_id, __entry->opcode)
|
||||
);
|
||||
|
||||
DEFINE_EVENT(xdna_mbox_msg, mbox_set_tail,
|
||||
TP_PROTO(char *name, u8 chann_id, u32 opcode, u32 id),
|
||||
TP_ARGS(name, chann_id, opcode, id)
|
||||
);
|
||||
|
||||
DEFINE_EVENT(xdna_mbox_msg, mbox_set_head,
|
||||
TP_PROTO(char *name, u8 chann_id, u32 opcode, u32 id),
|
||||
TP_ARGS(name, chann_id, opcode, id)
|
||||
);
|
||||
|
||||
TRACE_EVENT(mbox_irq_handle,
|
||||
TP_PROTO(char *name, int irq),
|
||||
|
||||
TP_ARGS(name, irq),
|
||||
|
||||
TP_STRUCT__entry(__string(name, name)
|
||||
__field(int, irq)),
|
||||
|
||||
TP_fast_assign(__assign_str(name);
|
||||
__entry->irq = irq;),
|
||||
|
||||
TP_printk("%s.%d", __get_str(name), __entry->irq)
|
||||
);
|
||||
|
||||
#endif /* !defined(_TRACE_AMDXDNA_H) || defined(TRACE_HEADER_MULTI_READ) */
|
||||
|
||||
/* This part must be outside protection */
|
||||
#include <trace/define_trace.h>
|
||||
Reference in New Issue
Block a user