| Message ID | 20170901161423.6737-1-tom.stdenis@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf > Of Tom St Denis > Sent: Friday, September 01, 2017 12:14 PM > To: amd-gfx@lists.freedesktop.org > Cc: StDenis, Tom; dri-devel@lists.freedesktop.org > Subject: [PATCH] drm/ttm: Fix trace include path (v2) > > Signed-off-by: Tom St Denis <tom.stdenis@amd.com> > > (v2): Drop Makefile change too. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/ttm/Makefile | 2 +- > drivers/gpu/drm/ttm/ttm_trace.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile > index fd3da00c0bf2..f0549eab73e6 100644 > --- a/drivers/gpu/drm/ttm/Makefile > +++ b/drivers/gpu/drm/ttm/Makefile > @@ -1,7 +1,7 @@ > # > # Makefile for the drm device driver. This driver provides support for the > > -ccflags-y := -Iinclude/drm -I$(src)/. > +ccflags-y := -Iinclude/drm > ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ > ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ > ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \ > diff --git a/drivers/gpu/drm/ttm/ttm_trace.h > b/drivers/gpu/drm/ttm/ttm_trace.h > index 23279b9b8e64..715ce68b7b33 100644 > --- a/drivers/gpu/drm/ttm/ttm_trace.h > +++ b/drivers/gpu/drm/ttm/ttm_trace.h > @@ -82,6 +82,6 @@ TRACE_EVENT(ttm_dma_unmap, > > /* This part must be outside protection */ > #undef TRACE_INCLUDE_PATH > -#define TRACE_INCLUDE_PATH . > +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/ttm/ > #include <trace/define_trace.h> > > -- > 2.12.0 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 01.09.2017 um 18:15 schrieb Deucher, Alexander: >> -----Original Message----- >> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf >> Of Tom St Denis >> Sent: Friday, September 01, 2017 12:14 PM >> To: amd-gfx@lists.freedesktop.org >> Cc: StDenis, Tom; dri-devel@lists.freedesktop.org >> Subject: [PATCH] drm/ttm: Fix trace include path (v2) >> >> Signed-off-by: Tom St Denis <tom.stdenis@amd.com> >> >> (v2): Drop Makefile change too. > Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> > >> --- >> drivers/gpu/drm/ttm/Makefile | 2 +- >> drivers/gpu/drm/ttm/ttm_trace.h | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile >> index fd3da00c0bf2..f0549eab73e6 100644 >> --- a/drivers/gpu/drm/ttm/Makefile >> +++ b/drivers/gpu/drm/ttm/Makefile >> @@ -1,7 +1,7 @@ >> # >> # Makefile for the drm device driver. This driver provides support for the >> >> -ccflags-y := -Iinclude/drm -I$(src)/. >> +ccflags-y := -Iinclude/drm >> ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ >> ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ >> ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \ >> diff --git a/drivers/gpu/drm/ttm/ttm_trace.h >> b/drivers/gpu/drm/ttm/ttm_trace.h >> index 23279b9b8e64..715ce68b7b33 100644 >> --- a/drivers/gpu/drm/ttm/ttm_trace.h >> +++ b/drivers/gpu/drm/ttm/ttm_trace.h >> @@ -82,6 +82,6 @@ TRACE_EVENT(ttm_dma_unmap, >> >> /* This part must be outside protection */ >> #undef TRACE_INCLUDE_PATH >> -#define TRACE_INCLUDE_PATH . >> +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/ttm/ >> #include <trace/define_trace.h> >> >> -- >> 2.12.0 >> >> _______________________________________________ >> amd-gfx mailing list >> amd-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/amd-gfx > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
On Fri, Sep 01, 2017 at 12:14:23PM -0400, Tom St Denis wrote: > Signed-off-by: Tom St Denis <tom.stdenis@amd.com> > > (v2): Drop Makefile change too. > --- > drivers/gpu/drm/ttm/Makefile | 2 +- > drivers/gpu/drm/ttm/ttm_trace.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Thierry Reding <treding@nvidia.com>
On 01/09/17 01:48 PM, Thierry Reding wrote: > On Fri, Sep 01, 2017 at 12:14:23PM -0400, Tom St Denis wrote: >> Signed-off-by: Tom St Denis <tom.stdenis@amd.com> >> >> (v2): Drop Makefile change too. >> --- >> drivers/gpu/drm/ttm/Makefile | 2 +- >> drivers/gpu/drm/ttm/ttm_trace.h | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) > > Reviewed-by: Thierry Reding <treding@nvidia.com> > Alex when you pull this into your fdo tree can you add these (and Christians R-b)? I already pushed it to our internal staging :-) Cheers, Tom
diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index fd3da00c0bf2..f0549eab73e6 100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile @@ -1,7 +1,7 @@ # # Makefile for the drm device driver. This driver provides support for the -ccflags-y := -Iinclude/drm -I$(src)/. +ccflags-y := -Iinclude/drm ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \ diff --git a/drivers/gpu/drm/ttm/ttm_trace.h b/drivers/gpu/drm/ttm/ttm_trace.h index 23279b9b8e64..715ce68b7b33 100644 --- a/drivers/gpu/drm/ttm/ttm_trace.h +++ b/drivers/gpu/drm/ttm/ttm_trace.h @@ -82,6 +82,6 @@ TRACE_EVENT(ttm_dma_unmap, /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/ttm/ #include <trace/define_trace.h>
Signed-off-by: Tom St Denis <tom.stdenis@amd.com> (v2): Drop Makefile change too. --- drivers/gpu/drm/ttm/Makefile | 2 +- drivers/gpu/drm/ttm/ttm_trace.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)