brcm2708: add kernel 4.14 support
[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.14 / 950-0172-drm-vc4-Use-correct-path-to-trace-include.patch
1 From 3af0d509b5718cfe7fbaf8c97e769d3df3743de0 Mon Sep 17 00:00:00 2001
2 From: Thierry Reding <treding@nvidia.com>
3 Date: Fri, 1 Sep 2017 16:49:54 +0200
4 Subject: [PATCH 172/454] drm/vc4: Use correct path to trace include
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 The header comment in include/trace/define_trace.h specifies that the
10 TRACE_INCLUDE_PATH needs to be relative to the define_trace.h header
11 rather than the trace file including it. Most instances get that wrong
12 and work around it by adding the $(src) directory to the include path.
13
14 While this works, it is preferable to refer to the correct path to the
15 trace file in the first place and avoid any workaround.
16
17 Acked-by: Christian König <christian.koenig@amd.com>
18 Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
19 Signed-off-by: Thierry Reding <treding@nvidia.com>
20 Link: https://patchwork.freedesktop.org/patch/msgid/20170901144954.19620-6-thierry.reding@gmail.com
21 (cherry picked from commit ff58a15a502a900c35ff2f20182249b65719d6d7)
22 ---
23 drivers/gpu/drm/vc4/Makefile | 2 --
24 drivers/gpu/drm/vc4/vc4_trace.h | 2 +-
25 2 files changed, 1 insertion(+), 3 deletions(-)
26
27 --- a/drivers/gpu/drm/vc4/Makefile
28 +++ b/drivers/gpu/drm/vc4/Makefile
29 @@ -26,5 +26,3 @@ vc4-y := \
30 vc4-$(CONFIG_DEBUG_FS) += vc4_debugfs.o
31
32 obj-$(CONFIG_DRM_VC4) += vc4.o
33 -
34 -CFLAGS_vc4_trace_points.o := -I$(src)
35 --- a/drivers/gpu/drm/vc4/vc4_trace.h
36 +++ b/drivers/gpu/drm/vc4/vc4_trace.h
37 @@ -59,5 +59,5 @@ TRACE_EVENT(vc4_wait_for_seqno_end,
38
39 /* This part must be outside protection */
40 #undef TRACE_INCLUDE_PATH
41 -#define TRACE_INCLUDE_PATH .
42 +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/vc4
43 #include <trace/define_trace.h>