drm/armada: Include current dir on CFLAGS for armada trace
diff mbox

Message ID 1484597610-14052-1-git-send-email-gustavo@padovan.org
State New
Headers show

Commit Message

Gustavo Padovan Jan. 16, 2017, 8:13 p.m. UTC
From: Gustavo Padovan <gustavo.padovan@collabora.com>

Otherwise compilation fails like this:

In file included from drivers/gpu/drm/armada/armada_trace.h:66:0,
                 from drivers/gpu/drm/armada/armada_trace.c:3:
./include/trace/define_trace.h:88:43: fatal error: ./armada_trace.h: No such file or directory
compilation terminated.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
---
 drivers/gpu/drm/armada/Makefile | 2 ++
 1 file changed, 2 insertions(+)

Comments

Laurent Pinchart Jan. 16, 2017, 8:37 p.m. UTC | #1
Hi Gustavo,

Thank you for the patch.

On Monday 16 Jan 2017 18:13:30 Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.com>
> 
> Otherwise compilation fails like this:
> 
> In file included from drivers/gpu/drm/armada/armada_trace.h:66:0,
>                  from drivers/gpu/drm/armada/armada_trace.c:3:
> ./include/trace/define_trace.h:88:43: fatal error: ./armada_trace.h: No such
> file or directory compilation terminated.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>

How about a Fixes: line ?

> ---
>  drivers/gpu/drm/armada/Makefile | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/armada/Makefile
> b/drivers/gpu/drm/armada/Makefile index a18f156..64c0b45 100644
> --- a/drivers/gpu/drm/armada/Makefile
> +++ b/drivers/gpu/drm/armada/Makefile
> @@ -4,3 +4,5 @@ armada-y	+= armada_510.o
>  armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
> 
>  obj-$(CONFIG_DRM_ARMADA) := armada.o
> +
> +CFLAGS_armada_trace.o := -I$(src)
Gustavo Padovan Jan. 16, 2017, 9:12 p.m. UTC | #2
2017-01-16 Laurent Pinchart <laurent.pinchart@ideasonboard.com>:

> Hi Gustavo,
> 
> Thank you for the patch.
> 
> On Monday 16 Jan 2017 18:13:30 Gustavo Padovan wrote:
> > From: Gustavo Padovan <gustavo.padovan@collabora.com>
> > 
> > Otherwise compilation fails like this:
> > 
> > In file included from drivers/gpu/drm/armada/armada_trace.h:66:0,
> >                  from drivers/gpu/drm/armada/armada_trace.c:3:
> > ./include/trace/define_trace.h:88:43: fatal error: ./armada_trace.h: No such
> > file or directory compilation terminated.
> > 
> > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
> 
> How about a Fixes: line ?

Fixes: c8a220c686a5 ("drm/armada: add tracing support")

Gustavo
Laurent Pinchart Jan. 16, 2017, 9:53 p.m. UTC | #3
Hi Gustavo,

(CC'ing Steven)

On Monday 16 Jan 2017 19:12:58 Gustavo Padovan wrote:
> 2017-01-16 Laurent Pinchart <laurent.pinchart@ideasonboard.com>:
> > On Monday 16 Jan 2017 18:13:30 Gustavo Padovan wrote:
> >> From: Gustavo Padovan <gustavo.padovan@collabora.com>
> >> 
> >> Otherwise compilation fails like this:
> >> 
> >> In file included from drivers/gpu/drm/armada/armada_trace.h:66:0,
> >> 
> >>                  from drivers/gpu/drm/armada/armada_trace.c:3:
> >> ./include/trace/define_trace.h:88:43: fatal error: ./armada_trace.h: No
> >> such file or directory compilation terminated.
> >> 
> >> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
> > 
> > How about a Fixes: line ?
> 
> Fixes: c8a220c686a5 ("drm/armada: add tracing support")

Thank you.

The approach taken here seems to be shared by a fair number of drivers, so

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

However, you could also set TRACE_INCLUDE_PATH to ../../drivers/gpu/drm/armada 
as done by drivers/dma-buf, drivers/ras and drivers/net/fjes. I'm not sure 
what's best, but if setting CFLAGS is preferred, I think we should get rid of 
TRACE_INCLUDE_PATH.

Steven, any opinion ? To avoid forcing you to dig the original e-mail up, the 
proposed fix is

> diff --git a/drivers/gpu/drm/armada/Makefile
> b/drivers/gpu/drm/armada/Makefile
> index a18f156..64c0b45 100644
> --- a/drivers/gpu/drm/armada/Makefile
> +++ b/drivers/gpu/drm/armada/Makefile
> @@ -4,3 +4,5 @@ armada-y        += armada_510.o
>  armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
>  
>  obj-$(CONFIG_DRM_ARMADA) := armada.o
> +
> +CFLAGS_armada_trace.o := -I$(src)
Daniel Vetter Jan. 23, 2017, 8:21 a.m. UTC | #4
On Mon, Jan 16, 2017 at 06:13:30PM -0200, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.com>
> 
> Otherwise compilation fails like this:
> 
> In file included from drivers/gpu/drm/armada/armada_trace.h:66:0,
>                  from drivers/gpu/drm/armada/armada_trace.c:3:
> ./include/trace/define_trace.h:88:43: fatal error: ./armada_trace.h: No such file or directory
> compilation terminated.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>

We have this already in

commit 7357f89954b6d005df6ab8929759e78d7d9a80f9
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Fri Dec 30 17:38:52 2016 +0100

    drm/armada: Fix compile fail
> ---
>  drivers/gpu/drm/armada/Makefile | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile
> index a18f156..64c0b45 100644
> --- a/drivers/gpu/drm/armada/Makefile
> +++ b/drivers/gpu/drm/armada/Makefile
> @@ -4,3 +4,5 @@ armada-y	+= armada_510.o
>  armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
>  
>  obj-$(CONFIG_DRM_ARMADA) := armada.o
> +
> +CFLAGS_armada_trace.o := -I$(src)
> -- 
> 2.5.5
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Steven Rostedt March 29, 2017, 1:27 a.m. UTC | #5
On Mon, 16 Jan 2017 23:53:53 +0200
Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote:

> Hi Gustavo,
> 
> (CC'ing Steven)

Sorry for the very late reply. I somehow missed this email. But I
figured I would reply to it anyway. At least for knowledge for future
changes.

> 
> On Monday 16 Jan 2017 19:12:58 Gustavo Padovan wrote:
> > 2017-01-16 Laurent Pinchart <laurent.pinchart@ideasonboard.com>:  
> > > On Monday 16 Jan 2017 18:13:30 Gustavo Padovan wrote:  
> > >> From: Gustavo Padovan <gustavo.padovan@collabora.com>
> > >> 
> > >> Otherwise compilation fails like this:
> > >> 
> > >> In file included from drivers/gpu/drm/armada/armada_trace.h:66:0,
> > >> 
> > >>                  from drivers/gpu/drm/armada/armada_trace.c:3:
> > >> ./include/trace/define_trace.h:88:43: fatal error: ./armada_trace.h: No
> > >> such file or directory compilation terminated.
> > >> 
> > >> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>  
> > > 
> > > How about a Fixes: line ?  
> > 
> > Fixes: c8a220c686a5 ("drm/armada: add tracing support")  
> 
> Thank you.
> 
> The approach taken here seems to be shared by a fair number of drivers, so
> 
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> However, you could also set TRACE_INCLUDE_PATH to ../../drivers/gpu/drm/armada 
> as done by drivers/dma-buf, drivers/ras and drivers/net/fjes. I'm not sure 
> what's best, but if setting CFLAGS is preferred, I think we should get rid of 
> TRACE_INCLUDE_PATH.

TRACE_INCLUDE_PATH is required either way. Because without it, it
defaults to include/trace.

> 
> Steven, any opinion ? To avoid forcing you to dig the original e-mail up, the 
> proposed fix is
> 
> > diff --git a/drivers/gpu/drm/armada/Makefile
> > b/drivers/gpu/drm/armada/Makefile
> > index a18f156..64c0b45 100644
> > --- a/drivers/gpu/drm/armada/Makefile
> > +++ b/drivers/gpu/drm/armada/Makefile
> > @@ -4,3 +4,5 @@ armada-y        += armada_510.o
> >  armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
> >  
> >  obj-$(CONFIG_DRM_ARMADA) := armada.o
> > +
> > +CFLAGS_armada_trace.o := -I$(src)  
> 

The safest way is to have the CFLAGS, but you still need to include

#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .

Because the created file will use:

#include "TRACE_INCLUDE_PATH/TRACE_INCLUDE_FILE"

The default TRACE_INCLUDE_PATH is "trace/events"

-- Steve

Patch
diff mbox

diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile
index a18f156..64c0b45 100644
--- a/drivers/gpu/drm/armada/Makefile
+++ b/drivers/gpu/drm/armada/Makefile
@@ -4,3 +4,5 @@  armada-y	+= armada_510.o
 armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
 
 obj-$(CONFIG_DRM_ARMADA) := armada.o
+
+CFLAGS_armada_trace.o := -I$(src)