History

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie: "Highlights: - AMD KFD driver merge This is the AMD HSA interface for exposing a lowlevel interface for GPGPU use. They have an open source userspace built on top of this interface, and the code looks as good as it was going to get out of tree. - Initial atomic modesetting work The need for an atomic modesetting interface to allow userspace to try and send a complete set of modesetting state to the driver has arisen, and been suffering from neglect this past year. No more, the start of the common code and changes for msm driver to use it are in this tree. Ongoing work to get the userspace ioctl finished and the code clean will probably wait until next kernel. - DisplayID 1.3 and tiled monitor exposed to userspace. Tiled monitor property is now exposed for userspace to make use of. - Rockchip drm driver merged. - imx gpu driver moved out of staging Other stuff: - core: panel - MIPI DSI + new panels. expose suggested x/y properties for virtual GPUs - i915: Initial Skylake (SKL) support gen3/4 reset work start of dri1/ums removal infoframe tracking fixes for lots of things. - nouveau: tegra k1 voltage support GM204 modesetting support GT21x memory reclocking work - radeon: CI dpm fixes GPUVM improvements Initial DPM fan control - rcar-du: HDMI support added removed some support for old boards slave encoder driver for Analog Devices adv7511 - exynos: Exynos4415 SoC support - msm: a4xx gpu support atomic helper conversion - tegra: iommu support universal plane support ganged-mode DSI support - sti: HDMI i2c improvements - vmwgfx: some late fixes. - qxl: use suggested x/y properties" * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (969 commits) drm: sti: fix module compilation issue drm/i915: save/restore GMBUS freq across suspend/resume on gen4 drm: sti: correctly cleanup CRTC and planes drm: sti: add HQVDP plane drm: sti: add cursor plane drm: sti: enable auxiliary CRTC drm: sti: fix delay in VTG programming drm: sti: prepare sti_tvout to support auxiliary crtc drm: sti: use drm_crtc_vblank_{on/off} instead of drm_vblank_{on/off} drm: sti: fix hdmi avi infoframe drm: sti: remove event lock while disabling vblank drm: sti: simplify gdp code drm: sti: clear all mixer control drm: sti: remove gpio for HDMI hot plug detection drm: sti: allow to change hdmi ddc i2c adapter drm/doc: Document drm_add_modes_noedid() usage drm/i915: Remove '& 0xffff' from the mask given to WA_REG() drm/i915: Invert the mask and val arguments in wa_add() and WA_REG() drm: Zero out DRM object memory upon cleanup drm/i915/bdw: Fix the write setting up the WIZ hashing mode ...

Linus Torvalds committed 11 years ago

Commit 988adfd2 parents 26178ec 4e0cd68549 files · +55591 −16726Browse files

Showing the changes to include/trace (1 of 549 files). Show all

Unified · Split

include/trace/events/host1x.h+15−12
@@ -29,6 +29,8 @@ · 28 unmodified lines
2929 #include <linux/ktime.h>
3030 #include <linux/tracepoint.h>
3131
32+struct host1x_bo;
33+
3234 DECLARE_EVENT_CLASS(host1x,
3335 TP_PROTO(const char *name),
3436 TP_ARGS(name),
@@ -79,14 +81,14 @@ TRACE_EVENT(host1x_cdma_push, · 44 unmodified lines
7981 );
8082
8183 TRACE_EVENT(host1x_cdma_push_gather,
82− TP_PROTO(const char *name, u32 mem_id,
84+ TP_PROTO(const char *name, struct host1x_bo *bo,
8385 u32 words, u32 offset, void *cmdbuf),
8486
85− TP_ARGS(name, mem_id, words, offset, cmdbuf),
87+ TP_ARGS(name, bo, words, offset, cmdbuf),
8688
8789 TP_STRUCT__entry(
8890 __field(const char *, name)
89− __field(u32, mem_id)
91+ __field(struct host1x_bo *, bo)
9092 __field(u32, words)
9193 __field(u32, offset)
9294 __field(bool, cmdbuf)
@@ -100,13 +102,13 @@ TRACE_EVENT(host1x_cdma_push_gather, · 7 unmodified lines
100102 }
101103 __entry->cmdbuf = cmdbuf;
102104 __entry->name = name;
103− __entry->mem_id = mem_id;
105+ __entry->bo = bo;
104106 __entry->words = words;
105107 __entry->offset = offset;
106108 ),
107109
108− TP_printk("name=%s, mem_id=%08x, words=%u, offset=%d, contents=[%s]",
109− __entry->name, __entry->mem_id,
110+ TP_printk("name=%s, bo=%p, words=%u, offset=%d, contents=[%s]",
111+ __entry->name, __entry->bo,
110112 __entry->words, __entry->offset,
111113 __print_hex(__get_dynamic_array(cmdbuf),
112114 __entry->cmdbuf ? __entry->words * 4 : 0))
@@ -221,12 +223,13 @@ TRACE_EVENT(host1x_syncpt_load_min, · 108 unmodified lines
221223 );
222224
223225 TRACE_EVENT(host1x_syncpt_wait_check,
224− TP_PROTO(void *mem_id, u32 offset, u32 syncpt_id, u32 thresh, u32 min),
226+ TP_PROTO(struct host1x_bo *bo, u32 offset, u32 syncpt_id, u32 thresh,
227+ u32 min),
225228
226− TP_ARGS(mem_id, offset, syncpt_id, thresh, min),
229+ TP_ARGS(bo, offset, syncpt_id, thresh, min),
227230
228231 TP_STRUCT__entry(
229− __field(void *, mem_id)
232+ __field(struct host1x_bo *, bo)
230233 __field(u32, offset)
231234 __field(u32, syncpt_id)
232235 __field(u32, thresh)
@@ -234,15 +237,15 @@ TRACE_EVENT(host1x_syncpt_wait_check, · 1 unmodified line
234237 ),
235238
236239 TP_fast_assign(
237− __entry->mem_id = mem_id;
240+ __entry->bo = bo;
238241 __entry->offset = offset;
239242 __entry->syncpt_id = syncpt_id;
240243 __entry->thresh = thresh;
241244 __entry->min = min;
242245 ),
243246
244− TP_printk("mem_id=%p, offset=%05x, id=%d, thresh=%d, current=%d",
245− __entry->mem_id, __entry->offset,
247+ TP_printk("bo=%p, offset=%05x, id=%d, thresh=%d, current=%d",
248+ __entry->bo, __entry->offset,
246249 __entry->syncpt_id, __entry->thresh,
247250 __entry->min)
248251 );

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t