Skip to content

Commit d99ce55

Browse files
committed
drm: Use correct path to trace include
The header comment in include/trace/define_trace.h specifies that the TRACE_INCLUDE_PATH needs to be relative to the define_trace.h header rather than the trace file including it. Most instances get that wrong and work around it by adding the $(src) directory to the include path. While this works, it is preferable to refer to the correct path to the trace file in the first place and avoid any workaround. Acked-by: Christian König <[email protected]> Acked-by: Daniel Vetter <[email protected]> Signed-off-by: Thierry Reding <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent b191406 commit d99ce55

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

drivers/gpu/drm/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
4444
obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
4545
obj-$(CONFIG_DRM_DEBUG_MM_SELFTEST) += selftests/
4646

47-
CFLAGS_drm_trace_points.o := -I$(src)
48-
4947
obj-$(CONFIG_DRM) += drm.o
5048
obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o
5149
obj-$(CONFIG_DRM_ARM) += arm/

drivers/gpu/drm/drm_trace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@ TRACE_EVENT(drm_vblank_event_delivered,
6161

6262
/* This part must be outside protection */
6363
#undef TRACE_INCLUDE_PATH
64-
#define TRACE_INCLUDE_PATH .
64+
#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm
6565
#include <trace/define_trace.h>

0 commit comments

Comments
 (0)