* [PATCH 1/6] drm: Use correct path to trace include
@ 2017-09-01 14:49 Thierry Reding
2017-09-01 14:49 ` [PATCH 2/6] drm/amdgpu: " Thierry Reding
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Thierry Reding @ 2017-09-01 14:49 UTC (permalink / raw)
To: dri-devel
From: Thierry Reding <treding@nvidia.com>
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@nvidia.com>
---
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>
--
2.13.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/6] drm/amdgpu: Use correct path to trace include
2017-09-01 14:49 [PATCH 1/6] drm: Use correct path to trace include Thierry Reding
@ 2017-09-01 14:49 ` Thierry Reding
2017-09-01 14:49 ` [PATCH 3/6] drm/armada: " Thierry Reding
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Thierry Reding @ 2017-09-01 14:49 UTC (permalink / raw)
To: dri-devel; +Cc: Alex Deucher, Christian König, amd-gfx
From: Thierry Reding <treding@nvidia.com>
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@nvidia.com>
---
drivers/gpu/drm/amd/amdgpu/Makefile | 2 --
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
index 658bac0cdc5e..25a95c95df14 100644
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -133,5 +133,3 @@ include $(FULL_AMD_PATH)/powerplay/Makefile
amdgpu-y += $(AMD_POWERPLAY_FILES)
obj-$(CONFIG_DRM_AMDGPU)+= amdgpu.o
-
-CFLAGS_amdgpu_trace_points.o := -I$(src)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
index 1c88bd5e29ad..0ee2c97ae79e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
@@ -473,5 +473,5 @@ TRACE_EVENT(amdgpu_ttm_bo_move,
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/amd/amdgpu
#include <trace/define_trace.h>
--
2.13.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/6] drm/armada: Use correct path to trace include
2017-09-01 14:49 [PATCH 1/6] drm: Use correct path to trace include Thierry Reding
2017-09-01 14:49 ` [PATCH 2/6] drm/amdgpu: " Thierry Reding
@ 2017-09-01 14:49 ` Thierry Reding
2017-09-01 14:49 ` [PATCH 4/6] drm/i915: " Thierry Reding
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Thierry Reding @ 2017-09-01 14:49 UTC (permalink / raw)
To: dri-devel; +Cc: Russell King
From: Thierry Reding <treding@nvidia.com>
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@nvidia.com>
---
drivers/gpu/drm/armada/Makefile | 2 --
drivers/gpu/drm/armada/armada_trace.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile
index 64c0b4546fb2..a18f156c8b66 100644
--- a/drivers/gpu/drm/armada/Makefile
+++ b/drivers/gpu/drm/armada/Makefile
@@ -4,5 +4,3 @@ armada-y += armada_510.o
armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
obj-$(CONFIG_DRM_ARMADA) := armada.o
-
-CFLAGS_armada_trace.o := -I$(src)
diff --git a/drivers/gpu/drm/armada/armada_trace.h b/drivers/gpu/drm/armada/armada_trace.h
index dc0cba70fd1a..be245a24610f 100644
--- a/drivers/gpu/drm/armada/armada_trace.h
+++ b/drivers/gpu/drm/armada/armada_trace.h
@@ -62,5 +62,5 @@ TRACE_EVENT(armada_ovl_plane_work,
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/armada
#include <trace/define_trace.h>
--
2.13.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/6] drm/i915: Use correct path to trace include
2017-09-01 14:49 [PATCH 1/6] drm: Use correct path to trace include Thierry Reding
2017-09-01 14:49 ` [PATCH 2/6] drm/amdgpu: " Thierry Reding
2017-09-01 14:49 ` [PATCH 3/6] drm/armada: " Thierry Reding
@ 2017-09-01 14:49 ` Thierry Reding
2017-09-01 14:49 ` [PATCH 5/6] drm/radeon: " Thierry Reding
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Thierry Reding @ 2017-09-01 14:49 UTC (permalink / raw)
To: dri-devel; +Cc: intel-gfx, Joonas Lahtinen, Rodrigo Vivi
From: Thierry Reding <treding@nvidia.com>
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@nvidia.com>
---
drivers/gpu/drm/i915/Makefile | 2 --
drivers/gpu/drm/i915/i915_trace.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 892f52b53060..1cb8059a3a16 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -150,5 +150,3 @@ endif
i915-y += intel_lpe_audio.o
obj-$(CONFIG_DRM_I915) += i915.o
-
-CFLAGS_i915_trace_points.o := -I$(src)
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index b24a83d43559..8794c198f877 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -1031,5 +1031,5 @@ TRACE_EVENT(switch_mm,
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/i915
#include <trace/define_trace.h>
--
2.13.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/6] drm/radeon: Use correct path to trace include
2017-09-01 14:49 [PATCH 1/6] drm: Use correct path to trace include Thierry Reding
` (2 preceding siblings ...)
2017-09-01 14:49 ` [PATCH 4/6] drm/i915: " Thierry Reding
@ 2017-09-01 14:49 ` Thierry Reding
2017-09-01 14:49 ` [PATCH 6/6] drm/vc4: " Thierry Reding
2017-09-01 15:02 ` [PATCH 1/6] drm: " Christian König
5 siblings, 0 replies; 10+ messages in thread
From: Thierry Reding @ 2017-09-01 14:49 UTC (permalink / raw)
To: dri-devel; +Cc: Alex Deucher, Christian König, amd-gfx
From: Thierry Reding <treding@nvidia.com>
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@nvidia.com>
---
drivers/gpu/drm/radeon/Makefile | 2 --
drivers/gpu/drm/radeon/radeon_trace.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index 4acbb944bcd2..be16c6390216 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -109,5 +109,3 @@ radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o
radeon-$(CONFIG_ACPI) += radeon_acpi.o
obj-$(CONFIG_DRM_RADEON)+= radeon.o
-
-CFLAGS_radeon_trace_points.o := -I$(src)
diff --git a/drivers/gpu/drm/radeon/radeon_trace.h b/drivers/gpu/drm/radeon/radeon_trace.h
index fdce4062901f..815eaa8c394b 100644
--- a/drivers/gpu/drm/radeon/radeon_trace.h
+++ b/drivers/gpu/drm/radeon/radeon_trace.h
@@ -204,5 +204,5 @@ DEFINE_EVENT(radeon_semaphore_request, radeon_semaphore_wait,
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/radeon
#include <trace/define_trace.h>
--
2.13.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/6] drm/vc4: Use correct path to trace include
2017-09-01 14:49 [PATCH 1/6] drm: Use correct path to trace include Thierry Reding
` (3 preceding siblings ...)
2017-09-01 14:49 ` [PATCH 5/6] drm/radeon: " Thierry Reding
@ 2017-09-01 14:49 ` Thierry Reding
2017-09-01 15:02 ` [PATCH 1/6] drm: " Christian König
5 siblings, 0 replies; 10+ messages in thread
From: Thierry Reding @ 2017-09-01 14:49 UTC (permalink / raw)
To: dri-devel
From: Thierry Reding <treding@nvidia.com>
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@nvidia.com>
---
drivers/gpu/drm/vc4/Makefile | 2 --
drivers/gpu/drm/vc4/vc4_trace.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile
index 25bd5d30415d..719a771f3d5c 100644
--- a/drivers/gpu/drm/vc4/Makefile
+++ b/drivers/gpu/drm/vc4/Makefile
@@ -24,5 +24,3 @@ vc4-y := \
vc4-$(CONFIG_DEBUG_FS) += vc4_debugfs.o
obj-$(CONFIG_DRM_VC4) += vc4.o
-
-CFLAGS_vc4_trace_points.o := -I$(src)
diff --git a/drivers/gpu/drm/vc4/vc4_trace.h b/drivers/gpu/drm/vc4/vc4_trace.h
index ad7b1ea720c2..deafb32923e1 100644
--- a/drivers/gpu/drm/vc4/vc4_trace.h
+++ b/drivers/gpu/drm/vc4/vc4_trace.h
@@ -59,5 +59,5 @@ TRACE_EVENT(vc4_wait_for_seqno_end,
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/vc4
#include <trace/define_trace.h>
--
2.13.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/6] drm: Use correct path to trace include
2017-09-01 14:49 [PATCH 1/6] drm: Use correct path to trace include Thierry Reding
` (4 preceding siblings ...)
2017-09-01 14:49 ` [PATCH 6/6] drm/vc4: " Thierry Reding
@ 2017-09-01 15:02 ` Christian König
2017-09-01 16:04 ` Tom St Denis
2017-09-01 16:36 ` Alex Deucher
5 siblings, 2 replies; 10+ messages in thread
From: Christian König @ 2017-09-01 15:02 UTC (permalink / raw)
To: Thierry Reding, dri-devel, StDenis, Tom
Am 01.09.2017 um 16:49 schrieb Thierry Reding:
> From: Thierry Reding <treding@nvidia.com>
>
> 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@nvidia.com>
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@amd.com>
The rest is Acked-by: Christian König <christian.koenig@amd.com>.
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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/6] drm: Use correct path to trace include
2017-09-01 15:02 ` [PATCH 1/6] drm: " Christian König
@ 2017-09-01 16:04 ` Tom St Denis
2017-09-01 16:36 ` Alex Deucher
1 sibling, 0 replies; 10+ messages in thread
From: Tom St Denis @ 2017-09-01 16:04 UTC (permalink / raw)
To: Christian König, Thierry Reding, dri-devel
On 01/09/17 11:02 AM, Christian König wrote:
> Am 01.09.2017 um 16:49 schrieb Thierry Reding:
>> From: Thierry Reding <treding@nvidia.com>
>>
>> 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@nvidia.com>
>
> 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@amd.com>
>
> The rest is Acked-by: Christian König <christian.koenig@amd.com>.
>
> Tom please check our TTM patch and if necessary provide a fix as well.
Hi Christian,
I'm sure we have it wrong and since I copied the TTM trace from the
AMDGPU one I think that's wrong too.
I'll submit the necessary patch(es) shortly.
Cheers,
Tom
>
> 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/6] drm: Use correct path to trace include
2017-09-01 15:02 ` [PATCH 1/6] drm: " Christian König
2017-09-01 16:04 ` Tom St Denis
@ 2017-09-01 16:36 ` Alex Deucher
2017-09-04 7:47 ` Daniel Vetter
1 sibling, 1 reply; 10+ messages in thread
From: Alex Deucher @ 2017-09-01 16:36 UTC (permalink / raw)
To: Christian König
Cc: StDenis, Tom, Thierry Reding, Maling list - DRI developers
On Fri, Sep 1, 2017 at 11:02 AM, Christian König
<christian.koenig@amd.com> wrote:
> Am 01.09.2017 um 16:49 schrieb Thierry Reding:
>>
>> From: Thierry Reding <treding@nvidia.com>
>>
>> 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@nvidia.com>
>
>
> 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@amd.com>
Applied patches 2 and 5 to my tree.
Thanks!
Alex
>
> The rest is Acked-by: Christian König <christian.koenig@amd.com>.
>
> 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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/6] drm: Use correct path to trace include
2017-09-01 16:36 ` Alex Deucher
@ 2017-09-04 7:47 ` Daniel Vetter
0 siblings, 0 replies; 10+ messages in thread
From: Daniel Vetter @ 2017-09-04 7:47 UTC (permalink / raw)
To: Alex Deucher
Cc: StDenis, Tom, Thierry Reding, Christian König,
Maling list - DRI developers
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@amd.com> wrote:
> > Am 01.09.2017 um 16:49 schrieb Thierry Reding:
> >>
> >> From: Thierry Reding <treding@nvidia.com>
> >>
> >> 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@nvidia.com>
> >
> >
> > 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@amd.com>
>
> 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@amd.com>.
> >
> > 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@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-09-04 7:47 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-01 14:49 [PATCH 1/6] drm: Use correct path to trace include Thierry Reding
2017-09-01 14:49 ` [PATCH 2/6] drm/amdgpu: " Thierry Reding
2017-09-01 14:49 ` [PATCH 3/6] drm/armada: " Thierry Reding
2017-09-01 14:49 ` [PATCH 4/6] drm/i915: " Thierry Reding
2017-09-01 14:49 ` [PATCH 5/6] drm/radeon: " Thierry Reding
2017-09-01 14:49 ` [PATCH 6/6] drm/vc4: " Thierry Reding
2017-09-01 15:02 ` [PATCH 1/6] drm: " Christian König
2017-09-01 16:04 ` Tom St Denis
2017-09-01 16:36 ` Alex Deucher
2017-09-04 7:47 ` Daniel Vetter
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.