mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 18:11:56 +00:00
e60e1ee606
-----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJaCm8RAAoJEAx081l5xIa+zX0QAJSm31kCG3vdw2CNiRx25L3q 3hcsEOgAjVJ9FQVGKFWjzb8TK35tSqtNx5kWIj0VGaIfBE5Bdg5SLLgKKUYas8rY 4LaphqICq2uxu2BNa2tpiar/sHhAnuozwQ4czpVWXzlaISnb9yYzRl7gMuyUVGkx +Gih5VUhLmQC0HsRTLJ3vaZQoUsLAl2gAjKcWa1bx57j2S+iKOPfsLaq7VYo+y1I Njc+iSGqMhJzRLXVkxL2lQKaslp7R38Bbh5K4Kvyjkm4Aq7zErOF6irpOXKMcrGl mwnr89vf1G9thjikrBaXpKnuvdbWYveoN/ORMlTdCfxkFnChHLnm3bd7NJ49RXDN Hv/Iq9YYjmZ9GTatxnx7lWtmXnZXC5he1yn1JAuz/yt7/0b/Wx+Mu/wEpBXYNFTd 1AZdD586i+AmPo3yDkqH9nBu8JC0W0AnS9VZma4LVvZOP2UfJmj5Im1CLHItbGDN FnUCkwyD/lJUUk+WgT+w/GOMJgmFHDiFFl4tFtYVVjrUirpCFVguSKG9xuv6tT8P 8iRsoP7RrcmDN9ojN2SEHwcpsAv3HnKkDv+9+GIbWnrGsSbCPq8Qm+JDSvf4h22I K5lwNpJrcpSKI+q10L7w2xliTBwb98sJkWGA/rssomrdBOWteGZAyqFRYAVgQ+mJ x/nJurIqQYh2KQN9+uLG =xVV2 -----END PGP SIGNATURE----- Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux Pull drm updates from Dave Airlie: "This is the main drm pull request for v4.15. Core: - Atomic object lifetime fixes - Atomic iterator improvements - Sparse/smatch fixes - Legacy kms ioctls to be interruptible - EDID override improvements - fb/gem helper cleanups - Simple outreachy patches - Documentation improvements - Fix dma-buf rcu races - DRM mode object leasing for improving VR use cases. - vgaarb improvements for non-x86 platforms. New driver: - tve200: Faraday Technology TVE200 block. This "TV Encoder" encodes a ITU-T BT.656 stream and can be found in the StorLink SL3516 (later Cortina Systems CS3516) as well as the Grain Media GM8180. New bridges: - SiI9234 support New panels: - S6E63J0X03, OTM8009A, Seiko 43WVF1G, 7" rpi touch panel, Toshiba LT089AC19000, Innolux AT043TN24 i915: - Remove Coffeelake from alpha support - Cannonlake workarounds - Infoframe refactoring for DisplayPort - VBT updates - DisplayPort vswing/emph/buffer translation refactoring - CCS fixes - Restore GPU clock boost on missed vblanks - Scatter list updates for userptr allocations - Gen9+ transition watermarks - Display IPC (Isochronous Priority Control) - Private PAT management - GVT: improved error handling and pci config sanitizing - Execlist refactoring - Transparent Huge Page support - User defined priorities support - HuC/GuC firmware refactoring - DP MST fixes - eDP power sequencing fixes - Use RCU instead of stop_machine - PSR state tracking support - Eviction fixes - BDW DP aux channel timeout fixes - LSPCON fixes - Cannonlake PLL fixes amdgpu: - Per VM BO support - Powerplay cleanups - CI powerplay support - PASID mgr for kfd - SR-IOV fixes - initial GPU reset for vega10 - Prime mmap support - TTM updates - Clock query interface for Raven - Fence to handle ioctl - UVD encode ring support on Polaris - Transparent huge page DMA support - Compute LRU pipe tweaks - BO flag to allow buffers to opt out of implicit sync - CTX priority setting API - VRAM lost infrastructure plumbing qxl: - fix flicker since atomic rework amdkfd: - Further improvements from internal AMD tree - Usermode events - Drop radeon support nouveau: - Pascal temperature sensor support - Improved BAR2 handling - MMU rework to support Pascal MMU exynos: - Improved HDMI/mixer support - HDMI audio interface support tegra: - Prep work for tegra186 - Cleanup/fixes msm: - Preemption support for a5xx - Display fixes for 8x96 (snapdragon 820) - Async cursor plane fixes - FW loading rework - GPU debugging improvements vc4: - Prep for DSI panels - fix T-format tiling scanout - New madvise ioctl Rockchip: - LVDS support omapdrm: - omap4 HDMI CEC support etnaviv: - GPU performance counters groundwork sun4i: - refactor driver load + TCON backend - HDMI improvements - A31 support - Misc fixes udl: - Probe/EDID read fixes. tilcdc: - Misc fixes. pl111: - Support more variants adv7511: - Improve EDID handling. - HDMI CEC support sii8620: - Add remote control support" * tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux: (1480 commits) drm/rockchip: analogix_dp: Use mutex rather than spinlock drm/mode_object: fix documentation for object lookups. drm/i915: Reorder context-close to avoid calling i915_vma_close() under RCU drm/i915: Move init_clock_gating() back to where it was drm/i915: Prune the reservation shared fence array drm/i915: Idle the GPU before shinking everything drm/i915: Lock llist_del_first() vs llist_del_all() drm/i915: Calculate ironlake intermediate watermarks correctly, v2. drm/i915: Disable lazy PPGTT page table optimization for vGPU drm/i915/execlists: Remove the priority "optimisation" drm/i915: Filter out spurious execlists context-switch interrupts drm/amdgpu: use irq-safe lock for kiq->ring_lock drm/amdgpu: bypass lru touch for KIQ ring submission drm/amdgpu: Potential uninitialized variable in amdgpu_vm_update_directories() drm/amdgpu: potential uninitialized variable in amdgpu_vce_ring_parse_cs() drm/amd/powerplay: initialize a variable before using it drm/amd/powerplay: suppress KASAN out of bounds warning in vega10_populate_all_memory_levels drm/amd/amdgpu: fix evicted VRAM bo adjudgement condition drm/vblank: Tune drm_crtc_accurate_vblank_count() WARN down to a debug drm/rockchip: add CONFIG_OF dependency for lvds ...
210 lines
5.0 KiB
C
210 lines
5.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#if !defined(_RADEON_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _RADEON_TRACE_H_
|
|
|
|
#include <linux/stringify.h>
|
|
#include <linux/types.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
#include <drm/drmP.h>
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM radeon
|
|
#define TRACE_INCLUDE_FILE radeon_trace
|
|
|
|
TRACE_EVENT(radeon_bo_create,
|
|
TP_PROTO(struct radeon_bo *bo),
|
|
TP_ARGS(bo),
|
|
TP_STRUCT__entry(
|
|
__field(struct radeon_bo *, bo)
|
|
__field(u32, pages)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->bo = bo;
|
|
__entry->pages = bo->tbo.num_pages;
|
|
),
|
|
TP_printk("bo=%p, pages=%u", __entry->bo, __entry->pages)
|
|
);
|
|
|
|
TRACE_EVENT(radeon_cs,
|
|
TP_PROTO(struct radeon_cs_parser *p),
|
|
TP_ARGS(p),
|
|
TP_STRUCT__entry(
|
|
__field(u32, ring)
|
|
__field(u32, dw)
|
|
__field(u32, fences)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->ring = p->ring;
|
|
__entry->dw = p->chunk_ib->length_dw;
|
|
__entry->fences = radeon_fence_count_emitted(
|
|
p->rdev, p->ring);
|
|
),
|
|
TP_printk("ring=%u, dw=%u, fences=%u",
|
|
__entry->ring, __entry->dw,
|
|
__entry->fences)
|
|
);
|
|
|
|
TRACE_EVENT(radeon_vm_grab_id,
|
|
TP_PROTO(unsigned vmid, int ring),
|
|
TP_ARGS(vmid, ring),
|
|
TP_STRUCT__entry(
|
|
__field(u32, vmid)
|
|
__field(u32, ring)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->vmid = vmid;
|
|
__entry->ring = ring;
|
|
),
|
|
TP_printk("vmid=%u, ring=%u", __entry->vmid, __entry->ring)
|
|
);
|
|
|
|
TRACE_EVENT(radeon_vm_bo_update,
|
|
TP_PROTO(struct radeon_bo_va *bo_va),
|
|
TP_ARGS(bo_va),
|
|
TP_STRUCT__entry(
|
|
__field(u64, soffset)
|
|
__field(u64, eoffset)
|
|
__field(u32, flags)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->soffset = bo_va->it.start;
|
|
__entry->eoffset = bo_va->it.last + 1;
|
|
__entry->flags = bo_va->flags;
|
|
),
|
|
TP_printk("soffs=%010llx, eoffs=%010llx, flags=%08x",
|
|
__entry->soffset, __entry->eoffset, __entry->flags)
|
|
);
|
|
|
|
TRACE_EVENT(radeon_vm_set_page,
|
|
TP_PROTO(uint64_t pe, uint64_t addr, unsigned count,
|
|
uint32_t incr, uint32_t flags),
|
|
TP_ARGS(pe, addr, count, incr, flags),
|
|
TP_STRUCT__entry(
|
|
__field(u64, pe)
|
|
__field(u64, addr)
|
|
__field(u32, count)
|
|
__field(u32, incr)
|
|
__field(u32, flags)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->pe = pe;
|
|
__entry->addr = addr;
|
|
__entry->count = count;
|
|
__entry->incr = incr;
|
|
__entry->flags = flags;
|
|
),
|
|
TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%08x, count=%u",
|
|
__entry->pe, __entry->addr, __entry->incr,
|
|
__entry->flags, __entry->count)
|
|
);
|
|
|
|
TRACE_EVENT(radeon_vm_flush,
|
|
TP_PROTO(uint64_t pd_addr, unsigned ring, unsigned id),
|
|
TP_ARGS(pd_addr, ring, id),
|
|
TP_STRUCT__entry(
|
|
__field(u64, pd_addr)
|
|
__field(u32, ring)
|
|
__field(u32, id)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->pd_addr = pd_addr;
|
|
__entry->ring = ring;
|
|
__entry->id = id;
|
|
),
|
|
TP_printk("pd_addr=%010Lx, ring=%u, id=%u",
|
|
__entry->pd_addr, __entry->ring, __entry->id)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(radeon_fence_request,
|
|
|
|
TP_PROTO(struct drm_device *dev, int ring, u32 seqno),
|
|
|
|
TP_ARGS(dev, ring, seqno),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(u32, dev)
|
|
__field(int, ring)
|
|
__field(u32, seqno)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->dev = dev->primary->index;
|
|
__entry->ring = ring;
|
|
__entry->seqno = seqno;
|
|
),
|
|
|
|
TP_printk("dev=%u, ring=%d, seqno=%u",
|
|
__entry->dev, __entry->ring, __entry->seqno)
|
|
);
|
|
|
|
DEFINE_EVENT(radeon_fence_request, radeon_fence_emit,
|
|
|
|
TP_PROTO(struct drm_device *dev, int ring, u32 seqno),
|
|
|
|
TP_ARGS(dev, ring, seqno)
|
|
);
|
|
|
|
DEFINE_EVENT(radeon_fence_request, radeon_fence_wait_begin,
|
|
|
|
TP_PROTO(struct drm_device *dev, int ring, u32 seqno),
|
|
|
|
TP_ARGS(dev, ring, seqno)
|
|
);
|
|
|
|
DEFINE_EVENT(radeon_fence_request, radeon_fence_wait_end,
|
|
|
|
TP_PROTO(struct drm_device *dev, int ring, u32 seqno),
|
|
|
|
TP_ARGS(dev, ring, seqno)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(radeon_semaphore_request,
|
|
|
|
TP_PROTO(int ring, struct radeon_semaphore *sem),
|
|
|
|
TP_ARGS(ring, sem),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(int, ring)
|
|
__field(signed, waiters)
|
|
__field(uint64_t, gpu_addr)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->ring = ring;
|
|
__entry->waiters = sem->waiters;
|
|
__entry->gpu_addr = sem->gpu_addr;
|
|
),
|
|
|
|
TP_printk("ring=%u, waiters=%d, addr=%010Lx", __entry->ring,
|
|
__entry->waiters, __entry->gpu_addr)
|
|
);
|
|
|
|
DEFINE_EVENT(radeon_semaphore_request, radeon_semaphore_signale,
|
|
|
|
TP_PROTO(int ring, struct radeon_semaphore *sem),
|
|
|
|
TP_ARGS(ring, sem)
|
|
);
|
|
|
|
DEFINE_EVENT(radeon_semaphore_request, radeon_semaphore_wait,
|
|
|
|
TP_PROTO(int ring, struct radeon_semaphore *sem),
|
|
|
|
TP_ARGS(ring, sem)
|
|
);
|
|
|
|
#endif
|
|
|
|
/* This part must be outside protection */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/radeon
|
|
#include <trace/define_trace.h>
|