drm/armada: Use correct path to trace include
authorThierry Reding <treding@nvidia.com>
Fri, 1 Sep 2017 14:49:51 +0000 (16:49 +0200)
committerThierry Reding <treding@nvidia.com>
Tue, 5 Sep 2017 09:11:20 +0000 (11:11 +0200)
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 <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170901144954.19620-3-thierry.reding@gmail.com
drivers/gpu/drm/armada/Makefile
drivers/gpu/drm/armada/armada_trace.h

index 64c0b4546fb240f92d0e91a8bdb4faff69417a1f..a18f156c8b663627ee250a2f9e2867688bafb163 100644 (file)
@@ -4,5 +4,3 @@ armada-y        += armada_510.o
 armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
 
 obj-$(CONFIG_DRM_ARMADA) := armada.o
-
-CFLAGS_armada_trace.o := -I$(src)
index dc0cba70fd1a3195bec5fe342974ca3524f6284f..be245a24610f06d6a71d878695b7209c4cf3ef2c 100644 (file)
@@ -62,5 +62,5 @@ TRACE_EVENT(armada_ovl_plane_work,
 
 /* This part must be outside protection */
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/armada
 #include <trace/define_trace.h>