On Fri, Sep 01, 2017 at 12:36:20PM -0400, Alex Deucher wrote: > On Fri, Sep 1, 2017 at 11:02 AM, Christian König > <christian.koenig@xxxxxxx> wrote: > > Am 01.09.2017 um 16:49 schrieb Thierry Reding: > >> > >> From: Thierry Reding <treding@xxxxxxxxxx> > >> > >> 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. > >> > >> Signed-off-by: Thierry Reding <treding@xxxxxxxxxx> > > > > > > Actually I've recently wondered how to correctly do this since we send out a > > TTM patch for 4.13 which most likely gets this wrong as well. > > > > Thanks for pointing this out, patch #2 and #5 are Reviewed-by: Christian > > König <christian.koenig@xxxxxxx> > > Applied patches 2 and 5 to my tree. i915 one pushed to drm-intel, pls push the others through drm-misc. fwiw a-b: me on those too. Thanks, Daniel > > Thanks! > > Alex > > > > > The rest is Acked-by: Christian König <christian.koenig@xxxxxxx>. > > > > Tom please check our TTM patch and if necessary provide a fix as well. > > > > Thanks, > > Christian. > > > > > >> --- > >> drivers/gpu/drm/Makefile | 2 -- > >> drivers/gpu/drm/drm_trace.h | 2 +- > >> 2 files changed, 1 insertion(+), 3 deletions(-) > >> > >> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > >> index a8acc197dec3..f82d0faad690 100644 > >> --- a/drivers/gpu/drm/Makefile > >> +++ b/drivers/gpu/drm/Makefile > >> @@ -44,8 +44,6 @@ drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += > >> drm_dp_aux_dev.o > >> obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o > >> obj-$(CONFIG_DRM_DEBUG_MM_SELFTEST) += selftests/ > >> -CFLAGS_drm_trace_points.o := -I$(src) > >> - > >> obj-$(CONFIG_DRM) += drm.o > >> obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o > >> obj-$(CONFIG_DRM_ARM) += arm/ > >> diff --git a/drivers/gpu/drm/drm_trace.h b/drivers/gpu/drm/drm_trace.h > >> index 14c5a777682e..16c64d067e67 100644 > >> --- a/drivers/gpu/drm/drm_trace.h > >> +++ b/drivers/gpu/drm/drm_trace.h > >> @@ -61,5 +61,5 @@ TRACE_EVENT(drm_vblank_event_delivered, > >> /* This part must be outside protection */ > >> #undef TRACE_INCLUDE_PATH > >> -#define TRACE_INCLUDE_PATH . > >> +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm > >> #include <trace/define_trace.h> > > > > > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@xxxxxxxxxxxxxxxxxxxxx > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
