<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
sure, this is a issue.<br>
but it wiil build succesed on local drm-next branch.<br>
and you can submit this patch to fix this issue.<br>
thanks.<br>
<br>
Reviewed-by: Kevin Wang <kevin1.wang@amd.com></div>
<div style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0);">
<hr tabindex="-1" style="display:inline-block; width:98%;">
<b>From:</b> Stephen Rothwell<br>
<b>Sent:</b> Thursday, November 21, 2019 11:54 AM<br>
<b>To:</b> Thomas Gleixner; Ingo Molnar; H. Peter Anvin; Peter Zijlstra; Dave Airlie; DRI<br>
<b>Cc:</b> Linux Next Mailing List; Linux Kernel Mailing List; Wang, Kevin(Yang); Deucher, Alexander<br>
<b>Subject:</b> linux-next: build failure after merge of the tip tree
<div><br>
</div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Hi all,<br>
<br>
After merging the tip tree, today's linux-next build (x86_64 allmodconfig)<br>
failed like this:<br>
<br>
In file included from include/trace/define_trace.h:102,<br>
from drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:502,<br>
from drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c:29:<br>
include/trace/../../drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:476:52: error: expected expression before ';' token<br>
476 | __string(ring, sched_job->base.sched->name);<br>
| ^<br>
include/trace/trace_events.h:435:2: note: in definition of macro 'DECLARE_EVENT_CLASS'<br>
435 | tstruct \<br>
| ^~~~~~~<br>
include/trace/trace_events.h:77:9: note: in expansion of macro 'PARAMS'<br>
77 | PARAMS(tstruct), \<br>
| ^~~~~~<br>
include/trace/../../drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:472:1: note: in expansion of macro 'TRACE_EVENT'<br>
472 | TRACE_EVENT(amdgpu_ib_pipe_sync,<br>
| ^~~~~~~~~~~<br>
include/trace/../../drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:475:6: note: in expansion of macro 'TP_STRUCT__entry'<br>
475 | TP_STRUCT__entry(<br>
| ^~~~~~~~~~~~~~~~<br>
<br>
Caused by commit<br>
<br>
2c2fdb8bca29 ("drm/amdgpu: fix amdgpu trace event print string format error")<br>
<br>
from the drm tree interacting with commit<br>
<br>
60fdad00827c ("ftrace: Rework event_create_dir()")<br>
<br>
from the tip tree.<br>
<br>
I have added the following merge fix patch:<br>
<br>
From: Stephen Rothwell <sfr@canb.auug.org.au><br>
Date: Thu, 21 Nov 2019 14:46:00 +1100<br>
Subject: [PATCH] merge fix for "ftrace: Rework event_create_dir()"<br>
<br>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h<br>
index f940526c5889..63e734a125fb 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h<br>
@@ -473,7 +473,7 @@ TRACE_EVENT(amdgpu_ib_pipe_sync,<br>
TP_PROTO(struct amdgpu_job *sched_job, struct dma_fence *fence),<br>
TP_ARGS(sched_job, fence),<br>
TP_STRUCT__entry(<br>
- __string(ring, sched_job->base.sched->name);<br>
+ __string(ring, sched_job->base.sched->name)<br>
__field(uint64_t, id)<br>
__field(struct dma_fence *, fence)<br>
__field(uint64_t, ctx)<br>
-- <br>
2.23.0<br>
<br>
-- <br>
Cheers,<br>
Stephen Rothwell<br>
</div>
</span></font></div>
</body>
</html>