diff options
author | Dave Airlie <airlied@redhat.com> | 2017-09-29 09:11:04 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-09-29 09:11:04 +0200 |
commit | 2b702e72e33bbdec0764cfb6e1dd00fe1142ae55 (patch) | |
tree | 1412cffe9835b58a4880a49e86f2351b4607412b /drivers/gpu/drm/tegra/trace.h | |
parent | Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux in... (diff) | |
parent | drm/tegra: trace: Fix path to include (diff) | |
download | linux-2b702e72e33bbdec0764cfb6e1dd00fe1142ae55.tar.xz linux-2b702e72e33bbdec0764cfb6e1dd00fe1142ae55.zip |
Merge tag 'drm-misc-fixes-2017-09-28-1' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Driver Changes:
- qxl: fix primary surface and fb unpinning (Gerd)
- sun41: fix CEC_PIN config gate now that media has been merged (Hans)
- tegra: fix TRACE_INCLUDE_PATH (Thierry)
Cc: Thierry Reding <treding@nvidia.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Gerd Hoffmann <kraxel@redhat.com>
* tag 'drm-misc-fixes-2017-09-28-1' of git://anongit.freedesktop.org/git/drm-misc:
drm/tegra: trace: Fix path to include
qxl: fix framebuffer unpinning
drm/sun4i: cec: Enable back CEC-pin framework
qxl: fix primary surface handling
Diffstat (limited to 'drivers/gpu/drm/tegra/trace.h')
-rw-r--r-- | drivers/gpu/drm/tegra/trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tegra/trace.h b/drivers/gpu/drm/tegra/trace.h index e9b7cdad5c4c..5a1ab4046e92 100644 --- a/drivers/gpu/drm/tegra/trace.h +++ b/drivers/gpu/drm/tegra/trace.h @@ -63,6 +63,6 @@ DEFINE_EVENT(register_access, sor_readl, /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/tegra #define TRACE_INCLUDE_FILE trace #include <trace/define_trace.h> |