All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Engestrom <eric.engestrom@imgtec.com>
To: Gustavo Padovan <gustavo@padovan.org>
Cc: devel@driverdev.osuosl.org,
	"Daniel Stone" <daniels@collabora.com>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	"Riley Andrews" <riandrews@android.com>,
	"Arve Hjønnevåg" <arve@android.com>,
	pavel@ucw.cz, "Daniel Vetter" <daniel.vetter@ffwll.ch>,
	"Gustavo Padovan" <gustavo.padovan@collabora.co.uk>,
	"John Harrison" <John.C.Harrison@Intel.com>
Subject: Re: [PATCH v2 3/6] staging/android: move trace/sync.h to sync_trace.h
Date: Thu, 11 Aug 2016 10:41:31 +0100	[thread overview]
Message-ID: <20160811094131.GO10429@imgtec.com> (raw)
In-Reply-To: <1470691462-19140-4-git-send-email-gustavo@padovan.org>

On Mon, Aug 08, 2016 at 06:24:19PM -0300, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> 
> The common behaviour for trace headers is to have them in the same folder
> they are used, instead of creating a special trace/ directory.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

> ---
>  drivers/staging/android/sw_sync.c    |  2 +-
>  drivers/staging/android/sync_trace.h | 32 ++++++++++++++++++++++++++++++++
>  drivers/staging/android/trace/sync.h | 32 --------------------------------
>  3 files changed, 33 insertions(+), 33 deletions(-)
>  create mode 100644 drivers/staging/android/sync_trace.h
>  delete mode 100644 drivers/staging/android/trace/sync.h
> 
> diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
> index ad0bb1a..745597b 100644
> --- a/drivers/staging/android/sw_sync.c
> +++ b/drivers/staging/android/sw_sync.c
> @@ -23,7 +23,7 @@
>  #include "sync_debug.h"
>  
>  #define CREATE_TRACE_POINTS
> -#include "trace/sync.h"
> +#include "sync_trace.h"
>  
>  struct sw_sync_create_fence_data {
>  	__u32	value;
> diff --git a/drivers/staging/android/sync_trace.h b/drivers/staging/android/sync_trace.h
> new file mode 100644
> index 0000000..ea485f7
> --- /dev/null
> +++ b/drivers/staging/android/sync_trace.h
> @@ -0,0 +1,32 @@
> +#undef TRACE_SYSTEM
> +#define TRACE_INCLUDE_PATH ../../drivers/staging/android
> +#define TRACE_SYSTEM sync_trace
> +
> +#if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ)
> +#define _TRACE_SYNC_H
> +
> +#include "sync_debug.h"
> +#include <linux/tracepoint.h>
> +
> +TRACE_EVENT(sync_timeline,
> +	TP_PROTO(struct sync_timeline *timeline),
> +
> +	TP_ARGS(timeline),
> +
> +	TP_STRUCT__entry(
> +			__string(name, timeline->name)
> +			__field(u32, value)
> +	),
> +
> +	TP_fast_assign(
> +			__assign_str(name, timeline->name);
> +			__entry->value = timeline->value;
> +	),
> +
> +	TP_printk("name=%s value=%d", __get_str(name), __entry->value)
> +);
> +
> +#endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */
> +
> +/* This part must be outside protection */
> +#include <trace/define_trace.h>
> diff --git a/drivers/staging/android/trace/sync.h b/drivers/staging/android/trace/sync.h
> deleted file mode 100644
> index 6b5ce96..0000000
> --- a/drivers/staging/android/trace/sync.h
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -#undef TRACE_SYSTEM
> -#define TRACE_INCLUDE_PATH ../../drivers/staging/android/trace
> -#define TRACE_SYSTEM sync
> -
> -#if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ)
> -#define _TRACE_SYNC_H
> -
> -#include "../sync_debug.h"
> -#include <linux/tracepoint.h>
> -
> -TRACE_EVENT(sync_timeline,
> -	TP_PROTO(struct sync_timeline *timeline),
> -
> -	TP_ARGS(timeline),
> -
> -	TP_STRUCT__entry(
> -			__string(name, timeline->name)
> -			__field(u32, value)
> -	),
> -
> -	TP_fast_assign(
> -			__assign_str(name, timeline->name);
> -			__entry->value = timeline->value;
> -	),
> -
> -	TP_printk("name=%s value=%d", __get_str(name), __entry->value)
> -);
> -
> -#endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */
> -
> -/* This part must be outside protection */
> -#include <trace/define_trace.h>
> -- 
> 2.5.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID (diff)
From: Eric Engestrom <eric.engestrom@imgtec.com>
To: Gustavo Padovan <gustavo@padovan.org>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	devel@driverdev.osuosl.org,
	"Daniel Stone" <daniels@collabora.com>,
	"Daniel Vetter" <daniel.vetter@ffwll.ch>,
	"Riley Andrews" <riandrews@android.com>,
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	"Arve Hjønnevåg" <arve@android.com>,
	pavel@ucw.cz, "Gustavo Padovan" <gustavo.padovan@collabora.co.uk>,
	"John Harrison" <John.C.Harrison@Intel.com>
Subject: Re: [PATCH v2 3/6] staging/android: move trace/sync.h to sync_trace.h
Date: Thu, 11 Aug 2016 10:41:31 +0100	[thread overview]
Message-ID: <20160811094131.GO10429@imgtec.com> (raw)
In-Reply-To: <1470691462-19140-4-git-send-email-gustavo@padovan.org>

On Mon, Aug 08, 2016 at 06:24:19PM -0300, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> 
> The common behaviour for trace headers is to have them in the same folder
> they are used, instead of creating a special trace/ directory.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

> ---
>  drivers/staging/android/sw_sync.c    |  2 +-
>  drivers/staging/android/sync_trace.h | 32 ++++++++++++++++++++++++++++++++
>  drivers/staging/android/trace/sync.h | 32 --------------------------------
>  3 files changed, 33 insertions(+), 33 deletions(-)
>  create mode 100644 drivers/staging/android/sync_trace.h
>  delete mode 100644 drivers/staging/android/trace/sync.h
> 
> diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
> index ad0bb1a..745597b 100644
> --- a/drivers/staging/android/sw_sync.c
> +++ b/drivers/staging/android/sw_sync.c
> @@ -23,7 +23,7 @@
>  #include "sync_debug.h"
>  
>  #define CREATE_TRACE_POINTS
> -#include "trace/sync.h"
> +#include "sync_trace.h"
>  
>  struct sw_sync_create_fence_data {
>  	__u32	value;
> diff --git a/drivers/staging/android/sync_trace.h b/drivers/staging/android/sync_trace.h
> new file mode 100644
> index 0000000..ea485f7
> --- /dev/null
> +++ b/drivers/staging/android/sync_trace.h
> @@ -0,0 +1,32 @@
> +#undef TRACE_SYSTEM
> +#define TRACE_INCLUDE_PATH ../../drivers/staging/android
> +#define TRACE_SYSTEM sync_trace
> +
> +#if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ)
> +#define _TRACE_SYNC_H
> +
> +#include "sync_debug.h"
> +#include <linux/tracepoint.h>
> +
> +TRACE_EVENT(sync_timeline,
> +	TP_PROTO(struct sync_timeline *timeline),
> +
> +	TP_ARGS(timeline),
> +
> +	TP_STRUCT__entry(
> +			__string(name, timeline->name)
> +			__field(u32, value)
> +	),
> +
> +	TP_fast_assign(
> +			__assign_str(name, timeline->name);
> +			__entry->value = timeline->value;
> +	),
> +
> +	TP_printk("name=%s value=%d", __get_str(name), __entry->value)
> +);
> +
> +#endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */
> +
> +/* This part must be outside protection */
> +#include <trace/define_trace.h>
> diff --git a/drivers/staging/android/trace/sync.h b/drivers/staging/android/trace/sync.h
> deleted file mode 100644
> index 6b5ce96..0000000
> --- a/drivers/staging/android/trace/sync.h
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -#undef TRACE_SYSTEM
> -#define TRACE_INCLUDE_PATH ../../drivers/staging/android/trace
> -#define TRACE_SYSTEM sync
> -
> -#if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ)
> -#define _TRACE_SYNC_H
> -
> -#include "../sync_debug.h"
> -#include <linux/tracepoint.h>
> -
> -TRACE_EVENT(sync_timeline,
> -	TP_PROTO(struct sync_timeline *timeline),
> -
> -	TP_ARGS(timeline),
> -
> -	TP_STRUCT__entry(
> -			__string(name, timeline->name)
> -			__field(u32, value)
> -	),
> -
> -	TP_fast_assign(
> -			__assign_str(name, timeline->name);
> -			__entry->value = timeline->value;
> -	),
> -
> -	TP_printk("name=%s value=%d", __get_str(name), __entry->value)
> -);
> -
> -#endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */
> -
> -/* This part must be outside protection */
> -#include <trace/define_trace.h>
> -- 
> 2.5.5

  reply	other threads:[~2016-08-11  9:41 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-08 21:24 [PATCH v2 0/6] de-stage SW_SYNC validation frawework Gustavo Padovan
2016-08-08 21:24 ` Gustavo Padovan
2016-08-08 21:24 ` [PATCH v2 1/6] staging/android: remove doc from sw_sync Gustavo Padovan
2016-08-08 21:24   ` Gustavo Padovan
2016-08-08 23:41   ` Pavel Machek
2016-08-08 23:41     ` Pavel Machek
2016-08-11 15:06     ` Gustavo Padovan
2016-08-11 15:06       ` Gustavo Padovan
2016-08-08 21:24 ` [PATCH v2 2/6] staging/android: do not let userspace trigger WARN_ON Gustavo Padovan
2016-08-08 21:24   ` Gustavo Padovan
2016-08-08 21:24 ` [PATCH v2 3/6] staging/android: move trace/sync.h to sync_trace.h Gustavo Padovan
2016-08-08 21:24   ` Gustavo Padovan
2016-08-11  9:41   ` Eric Engestrom [this message]
2016-08-11  9:41     ` Eric Engestrom
2016-08-08 21:24 ` [PATCH v2 4/6] staging/android: prepare sw_sync files for de-staging Gustavo Padovan
2016-08-08 21:24   ` Gustavo Padovan
2016-08-11  9:42   ` Eric Engestrom
2016-08-11  9:42     ` Eric Engestrom
2016-08-08 21:24 ` [PATCH v2 5/6] staging/android: add Doc for SW_SYNC ioctl interface Gustavo Padovan
2016-08-08 21:24   ` Gustavo Padovan
2016-08-11  9:43   ` Eric Engestrom
2016-08-11  9:43     ` Eric Engestrom
2016-08-08 21:24 ` [PATCH v2 6/6] dma-buf/sw_sync: de-stage SW_SYNC Gustavo Padovan
2016-08-08 21:24   ` Gustavo Padovan
2016-08-11  9:56   ` Eric Engestrom
2016-08-11  9:56     ` Eric Engestrom
2016-08-11  9:24 ` [PATCH v2 0/6] de-stage SW_SYNC validation frawework Eric Engestrom
2016-08-11  9:24   ` Eric Engestrom
2016-08-11 15:09   ` Gustavo Padovan
2016-08-11 15:09     ` Gustavo Padovan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160811094131.GO10429@imgtec.com \
    --to=eric.engestrom@imgtec.com \
    --cc=John.C.Harrison@Intel.com \
    --cc=arve@android.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=daniels@collabora.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=gustavo.padovan@collabora.co.uk \
    --cc=gustavo@padovan.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --cc=riandrews@android.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.