* [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
@ 2024-04-10 14:14 Jani Nikula
2024-04-10 14:54 ` Andrzej Hajda
2024-04-15 13:09 ` Jani Nikula
0 siblings, 2 replies; 11+ messages in thread
From: Jani Nikula @ 2024-04-10 14:14 UTC (permalink / raw)
To: dri-devel
Cc: intel-gfx, intel-xe, Jani Nikula, Andrzej Hajda, Neil Armstrong,
Robert Foss, Laurent Pinchart, Jonas Karlman, Jernej Skrabec,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Daniel Vetter, Jani Nikula, Karol Herbst,
Lyude Paul, Danilo Krummrich, Alex Deucher, Christian König,
Pan, Xinhui, Huang Rui, nouveau, amd-gfx
Surprisingly many places depend on debugfs.h to be included via
drm_print.h. Fix them.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Robert Foss <rfoss@kernel.org>
Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Jonas Karlman <jonas@kwiboo.se>
Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Karol Herbst <kherbst@redhat.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Danilo Krummrich <dakr@redhat.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Cc: Huang Rui <ray.huang@amd.com>
Cc: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
---
drivers/gpu/drm/bridge/panel.c | 2 ++
drivers/gpu/drm/drm_print.c | 6 +++---
drivers/gpu/drm/i915/display/intel_dmc.c | 1 +
drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 ++
drivers/gpu/drm/radeon/r100.c | 1 +
drivers/gpu/drm/radeon/r300.c | 1 +
drivers/gpu/drm/radeon/r420.c | 1 +
drivers/gpu/drm/radeon/r600.c | 3 ++-
drivers/gpu/drm/radeon/radeon_fence.c | 1 +
drivers/gpu/drm/radeon/radeon_gem.c | 1 +
drivers/gpu/drm/radeon/radeon_ib.c | 2 ++
drivers/gpu/drm/radeon/radeon_pm.c | 1 +
drivers/gpu/drm/radeon/radeon_ring.c | 2 ++
drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
drivers/gpu/drm/radeon/rs400.c | 1 +
drivers/gpu/drm/radeon/rv515.c | 1 +
drivers/gpu/drm/ttm/ttm_device.c | 1 +
drivers/gpu/drm/ttm/ttm_resource.c | 3 ++-
drivers/gpu/drm/ttm/ttm_tt.c | 5 +++--
include/drm/drm_print.h | 2 +-
20 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 7f41525f7a6e..32506524d9a2 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -4,6 +4,8 @@
* Copyright (C) 2017 Broadcom
*/
+#include <linux/debugfs.h>
+
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
#include <drm/drm_connector.h>
diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 699b7dbffd7b..cf2efb44722c 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -23,13 +23,13 @@
* Rob Clark <robdclark@gmail.com>
*/
-#include <linux/stdarg.h>
-
+#include <linux/debugfs.h>
+#include <linux/dynamic_debug.h>
#include <linux/io.h>
#include <linux/moduleparam.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
-#include <linux/dynamic_debug.h>
+#include <linux/stdarg.h>
#include <drm/drm.h>
#include <drm/drm_drv.h>
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index e61e9c1b8947..84748add186a 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -22,6 +22,7 @@
*
*/
+#include <linux/debugfs.h>
#include <linux/firmware.h>
#include "i915_drv.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c b/drivers/gpu/drm/nouveau/dispnv50/crc.c
index 9c942fbd836d..5936b6b3b15d 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/crc.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c
@@ -1,5 +1,7 @@
// SPDX-License-Identifier: MIT
+#include <linux/debugfs.h>
#include <linux/string.h>
+
#include <drm/drm_crtc.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_vblank.h>
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 86b8b770af19..0b1e19345f43 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/firmware.h>
#include <linux/module.h>
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 25201b9a5aae..1620f534f55f 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/pci.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index eae8a6389f5e..a979662eaa73 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/pci.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index b5e97d95a19f..087d41e370fd 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -26,11 +26,12 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/firmware.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/slab.h>
#include <linux/seq_file.h>
+#include <linux/slab.h>
#include <drm/drm_device.h>
#include <drm/drm_vblank.h>
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 9ebe4a0b9a6c..4fb780d96f32 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -30,6 +30,7 @@
*/
#include <linux/atomic.h>
+#include <linux/debugfs.h>
#include <linux/firmware.h>
#include <linux/kref.h>
#include <linux/sched/signal.h>
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 3fec3acdaf28..2ef201a072f1 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/iosys-map.h>
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/radeon_ib.c
index fb9ecf5dbe2b..63d914f3414d 100644
--- a/drivers/gpu/drm/radeon/radeon_ib.c
+++ b/drivers/gpu/drm/radeon/radeon_ib.c
@@ -27,6 +27,8 @@
* Christian König
*/
+#include <linux/debugfs.h>
+
#include <drm/drm_file.h>
#include "radeon.h"
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 4482c8c5f5ce..2d9d9f46f243 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -21,6 +21,7 @@
* Alex Deucher <alexdeucher@gmail.com>
*/
+#include <linux/debugfs.h>
#include <linux/hwmon-sysfs.h>
#include <linux/hwmon.h>
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 38048593bb4a..8d1d458286a8 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -27,6 +27,8 @@
* Christian König
*/
+#include <linux/debugfs.h>
+
#include <drm/drm_device.h>
#include <drm/drm_file.h>
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 2078b0000e22..5c65b6dfb99a 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -30,6 +30,7 @@
* Dave Airlie
*/
+#include <linux/debugfs.h>
#include <linux/dma-mapping.h>
#include <linux/pagemap.h>
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index d7f552d441ab..d4d1501e6576 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 79709d26d983..bbc6ccabf788 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c
index 76027960054f..434cf0258000 100644
--- a/drivers/gpu/drm/ttm/ttm_device.c
+++ b/drivers/gpu/drm/ttm/ttm_device.c
@@ -27,6 +27,7 @@
#define pr_fmt(fmt) "[TTM DEVICE] " fmt
+#include <linux/debugfs.h>
#include <linux/mm.h>
#include <drm/ttm/ttm_bo.h>
diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c
index be8d286513f9..4a66b851b67d 100644
--- a/drivers/gpu/drm/ttm/ttm_resource.c
+++ b/drivers/gpu/drm/ttm/ttm_resource.c
@@ -22,8 +22,9 @@
* Authors: Christian König
*/
-#include <linux/iosys-map.h>
+#include <linux/debugfs.h>
#include <linux/io-mapping.h>
+#include <linux/iosys-map.h>
#include <linux/scatterlist.h>
#include <drm/ttm/ttm_bo.h>
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 578a7c37f00b..474fe7aad2a0 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -32,10 +32,11 @@
#define pr_fmt(fmt) "[TTM] " fmt
#include <linux/cc_platform.h>
-#include <linux/sched.h>
-#include <linux/shmem_fs.h>
+#include <linux/debugfs.h>
#include <linux/file.h>
#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/shmem_fs.h>
#include <drm/drm_cache.h>
#include <drm/drm_device.h>
#include <drm/drm_util.h>
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 9cc473e5d353..561c3b96b6fd 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -30,11 +30,11 @@
#include <linux/printk.h>
#include <linux/seq_file.h>
#include <linux/device.h>
-#include <linux/debugfs.h>
#include <linux/dynamic_debug.h>
#include <drm/drm.h>
+struct debugfs_regset32;
struct drm_device;
/* Do *not* use outside of drm_print.[ch]! */
--
2.39.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
2024-04-10 14:14 [PATCH 1/2] drm/print: drop include debugfs.h and include where needed Jani Nikula
@ 2024-04-10 14:54 ` Andrzej Hajda
2024-04-15 13:09 ` Jani Nikula
1 sibling, 0 replies; 11+ messages in thread
From: Andrzej Hajda @ 2024-04-10 14:54 UTC (permalink / raw)
To: Jani Nikula, dri-devel
Cc: intel-gfx, intel-xe, Neil Armstrong, Robert Foss,
Laurent Pinchart, Jonas Karlman, Jernej Skrabec,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Daniel Vetter, Jani Nikula, Karol Herbst,
Lyude Paul, Danilo Krummrich, Alex Deucher, Christian König,
Pan, Xinhui, Huang Rui, nouveau, amd-gfx
On 10.04.2024 16:14, Jani Nikula wrote:
> Surprisingly many places depend on debugfs.h to be included via
> drm_print.h. Fix them.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> ---
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Regards
Andrzej
>
> Cc: Andrzej Hajda <andrzej.hajda@intel.com>
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: Robert Foss <rfoss@kernel.org>
> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
> Cc: Jonas Karlman <jonas@kwiboo.se>
> Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Karol Herbst <kherbst@redhat.com>
> Cc: Lyude Paul <lyude@redhat.com>
> Cc: Danilo Krummrich <dakr@redhat.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> Cc: Huang Rui <ray.huang@amd.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: intel-gfx@lists.freedesktop.org
> Cc: intel-xe@lists.freedesktop.org
> Cc: nouveau@lists.freedesktop.org
> Cc: amd-gfx@lists.freedesktop.org
> ---
> drivers/gpu/drm/bridge/panel.c | 2 ++
> drivers/gpu/drm/drm_print.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_dmc.c | 1 +
> drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 ++
> drivers/gpu/drm/radeon/r100.c | 1 +
> drivers/gpu/drm/radeon/r300.c | 1 +
> drivers/gpu/drm/radeon/r420.c | 1 +
> drivers/gpu/drm/radeon/r600.c | 3 ++-
> drivers/gpu/drm/radeon/radeon_fence.c | 1 +
> drivers/gpu/drm/radeon/radeon_gem.c | 1 +
> drivers/gpu/drm/radeon/radeon_ib.c | 2 ++
> drivers/gpu/drm/radeon/radeon_pm.c | 1 +
> drivers/gpu/drm/radeon/radeon_ring.c | 2 ++
> drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
> drivers/gpu/drm/radeon/rs400.c | 1 +
> drivers/gpu/drm/radeon/rv515.c | 1 +
> drivers/gpu/drm/ttm/ttm_device.c | 1 +
> drivers/gpu/drm/ttm/ttm_resource.c | 3 ++-
> drivers/gpu/drm/ttm/ttm_tt.c | 5 +++--
> include/drm/drm_print.h | 2 +-
> 20 files changed, 30 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> index 7f41525f7a6e..32506524d9a2 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -4,6 +4,8 @@
> * Copyright (C) 2017 Broadcom
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_bridge.h>
> #include <drm/drm_connector.h>
> diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
> index 699b7dbffd7b..cf2efb44722c 100644
> --- a/drivers/gpu/drm/drm_print.c
> +++ b/drivers/gpu/drm/drm_print.c
> @@ -23,13 +23,13 @@
> * Rob Clark <robdclark@gmail.com>
> */
>
> -#include <linux/stdarg.h>
> -
> +#include <linux/debugfs.h>
> +#include <linux/dynamic_debug.h>
> #include <linux/io.h>
> #include <linux/moduleparam.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> -#include <linux/dynamic_debug.h>
> +#include <linux/stdarg.h>
>
> #include <drm/drm.h>
> #include <drm/drm_drv.h>
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
> index e61e9c1b8947..84748add186a 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -22,6 +22,7 @@
> *
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
>
> #include "i915_drv.h"
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> index 9c942fbd836d..5936b6b3b15d 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/crc.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> @@ -1,5 +1,7 @@
> // SPDX-License-Identifier: MIT
> +#include <linux/debugfs.h>
> #include <linux/string.h>
> +
> #include <drm/drm_crtc.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_vblank.h>
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index 86b8b770af19..0b1e19345f43 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
> index 25201b9a5aae..1620f534f55f 100644
> --- a/drivers/gpu/drm/radeon/r300.c
> +++ b/drivers/gpu/drm/radeon/r300.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/pci.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
> index eae8a6389f5e..a979662eaa73 100644
> --- a/drivers/gpu/drm/radeon/r420.c
> +++ b/drivers/gpu/drm/radeon/r420.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/pci.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index b5e97d95a19f..087d41e370fd 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -26,11 +26,12 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> -#include <linux/slab.h>
> #include <linux/seq_file.h>
> +#include <linux/slab.h>
>
> #include <drm/drm_device.h>
> #include <drm/drm_vblank.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
> index 9ebe4a0b9a6c..4fb780d96f32 100644
> --- a/drivers/gpu/drm/radeon/radeon_fence.c
> +++ b/drivers/gpu/drm/radeon/radeon_fence.c
> @@ -30,6 +30,7 @@
> */
>
> #include <linux/atomic.h>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/kref.h>
> #include <linux/sched/signal.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
> index 3fec3acdaf28..2ef201a072f1 100644
> --- a/drivers/gpu/drm/radeon/radeon_gem.c
> +++ b/drivers/gpu/drm/radeon/radeon_gem.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/iosys-map.h>
> #include <linux/pci.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/radeon_ib.c
> index fb9ecf5dbe2b..63d914f3414d 100644
> --- a/drivers/gpu/drm/radeon/radeon_ib.c
> +++ b/drivers/gpu/drm/radeon/radeon_ib.c
> @@ -27,6 +27,8 @@
> * Christian König
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_file.h>
>
> #include "radeon.h"
> diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
> index 4482c8c5f5ce..2d9d9f46f243 100644
> --- a/drivers/gpu/drm/radeon/radeon_pm.c
> +++ b/drivers/gpu/drm/radeon/radeon_pm.c
> @@ -21,6 +21,7 @@
> * Alex Deucher <alexdeucher@gmail.com>
> */
>
> +#include <linux/debugfs.h>
> #include <linux/hwmon-sysfs.h>
> #include <linux/hwmon.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
> index 38048593bb4a..8d1d458286a8 100644
> --- a/drivers/gpu/drm/radeon/radeon_ring.c
> +++ b/drivers/gpu/drm/radeon/radeon_ring.c
> @@ -27,6 +27,8 @@
> * Christian König
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_device.h>
> #include <drm/drm_file.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 2078b0000e22..5c65b6dfb99a 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -30,6 +30,7 @@
> * Dave Airlie
> */
>
> +#include <linux/debugfs.h>
> #include <linux/dma-mapping.h>
> #include <linux/pagemap.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
> index d7f552d441ab..d4d1501e6576 100644
> --- a/drivers/gpu/drm/radeon/rs400.c
> +++ b/drivers/gpu/drm/radeon/rs400.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
> index 79709d26d983..bbc6ccabf788 100644
> --- a/drivers/gpu/drm/radeon/rv515.c
> +++ b/drivers/gpu/drm/radeon/rv515.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c
> index 76027960054f..434cf0258000 100644
> --- a/drivers/gpu/drm/ttm/ttm_device.c
> +++ b/drivers/gpu/drm/ttm/ttm_device.c
> @@ -27,6 +27,7 @@
>
> #define pr_fmt(fmt) "[TTM DEVICE] " fmt
>
> +#include <linux/debugfs.h>
> #include <linux/mm.h>
>
> #include <drm/ttm/ttm_bo.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c
> index be8d286513f9..4a66b851b67d 100644
> --- a/drivers/gpu/drm/ttm/ttm_resource.c
> +++ b/drivers/gpu/drm/ttm/ttm_resource.c
> @@ -22,8 +22,9 @@
> * Authors: Christian König
> */
>
> -#include <linux/iosys-map.h>
> +#include <linux/debugfs.h>
> #include <linux/io-mapping.h>
> +#include <linux/iosys-map.h>
> #include <linux/scatterlist.h>
>
> #include <drm/ttm/ttm_bo.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
> index 578a7c37f00b..474fe7aad2a0 100644
> --- a/drivers/gpu/drm/ttm/ttm_tt.c
> +++ b/drivers/gpu/drm/ttm/ttm_tt.c
> @@ -32,10 +32,11 @@
> #define pr_fmt(fmt) "[TTM] " fmt
>
> #include <linux/cc_platform.h>
> -#include <linux/sched.h>
> -#include <linux/shmem_fs.h>
> +#include <linux/debugfs.h>
> #include <linux/file.h>
> #include <linux/module.h>
> +#include <linux/sched.h>
> +#include <linux/shmem_fs.h>
> #include <drm/drm_cache.h>
> #include <drm/drm_device.h>
> #include <drm/drm_util.h>
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 9cc473e5d353..561c3b96b6fd 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -30,11 +30,11 @@
> #include <linux/printk.h>
> #include <linux/seq_file.h>
> #include <linux/device.h>
> -#include <linux/debugfs.h>
> #include <linux/dynamic_debug.h>
>
> #include <drm/drm.h>
>
> +struct debugfs_regset32;
> struct drm_device;
>
> /* Do *not* use outside of drm_print.[ch]! */
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
2024-04-10 14:14 [PATCH 1/2] drm/print: drop include debugfs.h and include where needed Jani Nikula
2024-04-10 14:54 ` Andrzej Hajda
@ 2024-04-15 13:09 ` Jani Nikula
2024-04-15 14:23 ` Maxime Ripard
1 sibling, 1 reply; 11+ messages in thread
From: Jani Nikula @ 2024-04-15 13:09 UTC (permalink / raw)
To: dri-devel
Cc: intel-gfx, intel-xe, Andrzej Hajda, Neil Armstrong, Robert Foss,
Laurent Pinchart, Jonas Karlman, Jernej Skrabec,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Daniel Vetter, Karol Herbst, Lyude Paul,
Danilo Krummrich, Alex Deucher, Christian König, Pan,
Xinhui, Huang Rui, nouveau, amd-gfx
On Wed, 10 Apr 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> Surprisingly many places depend on debugfs.h to be included via
> drm_print.h. Fix them.
While all of this is trivial, merely adding some includes, please
consider acking the changes to your corner of the kernel.
Thanks,
Jani.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> ---
>
> Cc: Andrzej Hajda <andrzej.hajda@intel.com>
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: Robert Foss <rfoss@kernel.org>
> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
> Cc: Jonas Karlman <jonas@kwiboo.se>
> Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Karol Herbst <kherbst@redhat.com>
> Cc: Lyude Paul <lyude@redhat.com>
> Cc: Danilo Krummrich <dakr@redhat.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> Cc: Huang Rui <ray.huang@amd.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: intel-gfx@lists.freedesktop.org
> Cc: intel-xe@lists.freedesktop.org
> Cc: nouveau@lists.freedesktop.org
> Cc: amd-gfx@lists.freedesktop.org
> ---
> drivers/gpu/drm/bridge/panel.c | 2 ++
> drivers/gpu/drm/drm_print.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_dmc.c | 1 +
> drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 ++
> drivers/gpu/drm/radeon/r100.c | 1 +
> drivers/gpu/drm/radeon/r300.c | 1 +
> drivers/gpu/drm/radeon/r420.c | 1 +
> drivers/gpu/drm/radeon/r600.c | 3 ++-
> drivers/gpu/drm/radeon/radeon_fence.c | 1 +
> drivers/gpu/drm/radeon/radeon_gem.c | 1 +
> drivers/gpu/drm/radeon/radeon_ib.c | 2 ++
> drivers/gpu/drm/radeon/radeon_pm.c | 1 +
> drivers/gpu/drm/radeon/radeon_ring.c | 2 ++
> drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
> drivers/gpu/drm/radeon/rs400.c | 1 +
> drivers/gpu/drm/radeon/rv515.c | 1 +
> drivers/gpu/drm/ttm/ttm_device.c | 1 +
> drivers/gpu/drm/ttm/ttm_resource.c | 3 ++-
> drivers/gpu/drm/ttm/ttm_tt.c | 5 +++--
> include/drm/drm_print.h | 2 +-
> 20 files changed, 30 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> index 7f41525f7a6e..32506524d9a2 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -4,6 +4,8 @@
> * Copyright (C) 2017 Broadcom
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_bridge.h>
> #include <drm/drm_connector.h>
> diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
> index 699b7dbffd7b..cf2efb44722c 100644
> --- a/drivers/gpu/drm/drm_print.c
> +++ b/drivers/gpu/drm/drm_print.c
> @@ -23,13 +23,13 @@
> * Rob Clark <robdclark@gmail.com>
> */
>
> -#include <linux/stdarg.h>
> -
> +#include <linux/debugfs.h>
> +#include <linux/dynamic_debug.h>
> #include <linux/io.h>
> #include <linux/moduleparam.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> -#include <linux/dynamic_debug.h>
> +#include <linux/stdarg.h>
>
> #include <drm/drm.h>
> #include <drm/drm_drv.h>
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
> index e61e9c1b8947..84748add186a 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -22,6 +22,7 @@
> *
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
>
> #include "i915_drv.h"
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> index 9c942fbd836d..5936b6b3b15d 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/crc.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> @@ -1,5 +1,7 @@
> // SPDX-License-Identifier: MIT
> +#include <linux/debugfs.h>
> #include <linux/string.h>
> +
> #include <drm/drm_crtc.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_vblank.h>
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index 86b8b770af19..0b1e19345f43 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
> index 25201b9a5aae..1620f534f55f 100644
> --- a/drivers/gpu/drm/radeon/r300.c
> +++ b/drivers/gpu/drm/radeon/r300.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/pci.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
> index eae8a6389f5e..a979662eaa73 100644
> --- a/drivers/gpu/drm/radeon/r420.c
> +++ b/drivers/gpu/drm/radeon/r420.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/pci.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index b5e97d95a19f..087d41e370fd 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -26,11 +26,12 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> -#include <linux/slab.h>
> #include <linux/seq_file.h>
> +#include <linux/slab.h>
>
> #include <drm/drm_device.h>
> #include <drm/drm_vblank.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
> index 9ebe4a0b9a6c..4fb780d96f32 100644
> --- a/drivers/gpu/drm/radeon/radeon_fence.c
> +++ b/drivers/gpu/drm/radeon/radeon_fence.c
> @@ -30,6 +30,7 @@
> */
>
> #include <linux/atomic.h>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/kref.h>
> #include <linux/sched/signal.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
> index 3fec3acdaf28..2ef201a072f1 100644
> --- a/drivers/gpu/drm/radeon/radeon_gem.c
> +++ b/drivers/gpu/drm/radeon/radeon_gem.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/iosys-map.h>
> #include <linux/pci.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/radeon_ib.c
> index fb9ecf5dbe2b..63d914f3414d 100644
> --- a/drivers/gpu/drm/radeon/radeon_ib.c
> +++ b/drivers/gpu/drm/radeon/radeon_ib.c
> @@ -27,6 +27,8 @@
> * Christian König
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_file.h>
>
> #include "radeon.h"
> diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
> index 4482c8c5f5ce..2d9d9f46f243 100644
> --- a/drivers/gpu/drm/radeon/radeon_pm.c
> +++ b/drivers/gpu/drm/radeon/radeon_pm.c
> @@ -21,6 +21,7 @@
> * Alex Deucher <alexdeucher@gmail.com>
> */
>
> +#include <linux/debugfs.h>
> #include <linux/hwmon-sysfs.h>
> #include <linux/hwmon.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
> index 38048593bb4a..8d1d458286a8 100644
> --- a/drivers/gpu/drm/radeon/radeon_ring.c
> +++ b/drivers/gpu/drm/radeon/radeon_ring.c
> @@ -27,6 +27,8 @@
> * Christian König
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_device.h>
> #include <drm/drm_file.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 2078b0000e22..5c65b6dfb99a 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -30,6 +30,7 @@
> * Dave Airlie
> */
>
> +#include <linux/debugfs.h>
> #include <linux/dma-mapping.h>
> #include <linux/pagemap.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
> index d7f552d441ab..d4d1501e6576 100644
> --- a/drivers/gpu/drm/radeon/rs400.c
> +++ b/drivers/gpu/drm/radeon/rs400.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
> index 79709d26d983..bbc6ccabf788 100644
> --- a/drivers/gpu/drm/radeon/rv515.c
> +++ b/drivers/gpu/drm/radeon/rv515.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c
> index 76027960054f..434cf0258000 100644
> --- a/drivers/gpu/drm/ttm/ttm_device.c
> +++ b/drivers/gpu/drm/ttm/ttm_device.c
> @@ -27,6 +27,7 @@
>
> #define pr_fmt(fmt) "[TTM DEVICE] " fmt
>
> +#include <linux/debugfs.h>
> #include <linux/mm.h>
>
> #include <drm/ttm/ttm_bo.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c
> index be8d286513f9..4a66b851b67d 100644
> --- a/drivers/gpu/drm/ttm/ttm_resource.c
> +++ b/drivers/gpu/drm/ttm/ttm_resource.c
> @@ -22,8 +22,9 @@
> * Authors: Christian König
> */
>
> -#include <linux/iosys-map.h>
> +#include <linux/debugfs.h>
> #include <linux/io-mapping.h>
> +#include <linux/iosys-map.h>
> #include <linux/scatterlist.h>
>
> #include <drm/ttm/ttm_bo.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
> index 578a7c37f00b..474fe7aad2a0 100644
> --- a/drivers/gpu/drm/ttm/ttm_tt.c
> +++ b/drivers/gpu/drm/ttm/ttm_tt.c
> @@ -32,10 +32,11 @@
> #define pr_fmt(fmt) "[TTM] " fmt
>
> #include <linux/cc_platform.h>
> -#include <linux/sched.h>
> -#include <linux/shmem_fs.h>
> +#include <linux/debugfs.h>
> #include <linux/file.h>
> #include <linux/module.h>
> +#include <linux/sched.h>
> +#include <linux/shmem_fs.h>
> #include <drm/drm_cache.h>
> #include <drm/drm_device.h>
> #include <drm/drm_util.h>
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 9cc473e5d353..561c3b96b6fd 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -30,11 +30,11 @@
> #include <linux/printk.h>
> #include <linux/seq_file.h>
> #include <linux/device.h>
> -#include <linux/debugfs.h>
> #include <linux/dynamic_debug.h>
>
> #include <drm/drm.h>
>
> +struct debugfs_regset32;
> struct drm_device;
>
> /* Do *not* use outside of drm_print.[ch]! */
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: Re: [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
2024-04-15 13:09 ` Jani Nikula
@ 2024-04-15 14:23 ` Maxime Ripard
0 siblings, 0 replies; 11+ messages in thread
From: Maxime Ripard @ 2024-04-15 14:23 UTC (permalink / raw)
To: Jani Nikula
Cc: amd-gfx, dri-devel, intel-gfx, intel-xe, nouveau, Alex Deucher,
Andrzej Hajda, ChristianKönig, Daniel Vetter,
Danilo Krummrich, David Airlie, Huang Rui, Jernej Skrabec,
Jonas Karlman, Karol Herbst, Laurent Pinchart, Lyude Paul,
Maarten Lankhorst, Maxime Ripard, Neil Armstrong, "\"Pan,
Xinhui\"",
Robert Foss, Thomas Zimmermann
On Mon, 15 Apr 2024 16:09:22 +0300, Jani Nikula wrote:
> On Wed, 10 Apr 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> > Surprisingly many places depend on debugfs.h to be included via
> > drm_print.h. Fix them.
>
> While all of this is trivial, merely adding some includes, please
>
> [ ... ]
Acked-by: Maxime Ripard <mripard@kernel.org>
Thanks!
Maxime
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
2024-04-22 12:10 Jani Nikula
` (3 preceding siblings ...)
2024-04-24 20:50 ` Lucas De Marchi
@ 2024-04-25 11:36 ` Robert Foss
4 siblings, 0 replies; 11+ messages in thread
From: Robert Foss @ 2024-04-25 11:36 UTC (permalink / raw)
To: Jani Nikula
Cc: dri-devel, Andrzej Hajda, Maxime Ripard, Jacek Lawrynowicz,
Stanislaw Gruszka, Oded Gabbay, Russell King, David Airlie,
Daniel Vetter, Neil Armstrong, Laurent Pinchart, Jonas Karlman,
Jernej Skrabec, Maarten Lankhorst, Thomas Zimmermann,
Jani Nikula, Rodrigo Vivi, Joonas Lahtinen, Tvrtko Ursulin,
Frank Binns, Matt Coster, Rob Clark, Abhinav Kumar,
Dmitry Baryshkov, Sean Paul, Marijn Suijten, Karol Herbst,
Lyude Paul, Danilo Krummrich, Alex Deucher, Christian König,
Pan, Xinhui, Alain Volmat, Huang Rui, Zack Rusin,
Broadcom internal kernel review list, Lucas De Marchi,
Thomas Hellström, intel-gfx, intel-xe, linux-arm-msm,
freedreno, nouveau, amd-gfx
On Mon, Apr 22, 2024 at 2:10 PM Jani Nikula <jani.nikula@intel.com> wrote:
>
> Surprisingly many places depend on debugfs.h to be included via
> drm_print.h. Fix them.
>
> v3: Also fix armada, ite-it6505, imagination, msm, sti, vc4, and xe
>
> v2: Also fix ivpu and vmwgfx
>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> Acked-by: Maxime Ripard <mripard@kernel.org>
> Link: https://patchwork.freedesktop.org/patch/msgid/20240410141434.157908-1-jani.nikula@intel.com
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> ---
>
> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> Cc: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
> Cc: Oded Gabbay <ogabbay@kernel.org>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Andrzej Hajda <andrzej.hajda@intel.com>
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: Robert Foss <rfoss@kernel.org>
> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
> Cc: Jonas Karlman <jonas@kwiboo.se>
> Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tursulin@ursulin.net>
> Cc: Frank Binns <frank.binns@imgtec.com>
> Cc: Matt Coster <matt.coster@imgtec.com>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Cc: Sean Paul <sean@poorly.run>
> Cc: Marijn Suijten <marijn.suijten@somainline.org>
> Cc: Karol Herbst <kherbst@redhat.com>
> Cc: Lyude Paul <lyude@redhat.com>
> Cc: Danilo Krummrich <dakr@redhat.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> Cc: Alain Volmat <alain.volmat@foss.st.com>
> Cc: Huang Rui <ray.huang@amd.com>
> Cc: Zack Rusin <zack.rusin@broadcom.com>
> Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: intel-gfx@lists.freedesktop.org
> Cc: intel-xe@lists.freedesktop.org
> Cc: linux-arm-msm@vger.kernel.org
> Cc: freedreno@lists.freedesktop.org
> Cc: nouveau@lists.freedesktop.org
> Cc: amd-gfx@lists.freedesktop.org
> ---
> drivers/accel/ivpu/ivpu_debugfs.c | 2 ++
> drivers/gpu/drm/armada/armada_debugfs.c | 1 +
> drivers/gpu/drm/bridge/ite-it6505.c | 1 +
> drivers/gpu/drm/bridge/panel.c | 2 ++
> drivers/gpu/drm/drm_print.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_dmc.c | 1 +
> drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 +
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 ++
> drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 ++
> drivers/gpu/drm/radeon/r100.c | 1 +
> drivers/gpu/drm/radeon/r300.c | 1 +
> drivers/gpu/drm/radeon/r420.c | 1 +
> drivers/gpu/drm/radeon/r600.c | 3 ++-
> drivers/gpu/drm/radeon/radeon_fence.c | 1 +
> drivers/gpu/drm/radeon/radeon_gem.c | 1 +
> drivers/gpu/drm/radeon/radeon_ib.c | 2 ++
> drivers/gpu/drm/radeon/radeon_pm.c | 1 +
> drivers/gpu/drm/radeon/radeon_ring.c | 2 ++
> drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
> drivers/gpu/drm/radeon/rs400.c | 1 +
> drivers/gpu/drm/radeon/rv515.c | 1 +
> drivers/gpu/drm/sti/sti_drv.c | 1 +
> drivers/gpu/drm/ttm/ttm_device.c | 1 +
> drivers/gpu/drm/ttm/ttm_resource.c | 3 ++-
> drivers/gpu/drm/ttm/ttm_tt.c | 5 +++--
> drivers/gpu/drm/vc4/vc4_drv.h | 1 +
> drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 ++
> drivers/gpu/drm/xe/xe_debugfs.c | 1 +
> drivers/gpu/drm/xe/xe_gt_debugfs.c | 2 ++
> drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 ++
> include/drm/drm_print.h | 2 +-
> 31 files changed, 46 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/accel/ivpu/ivpu_debugfs.c b/drivers/accel/ivpu/ivpu_debugfs.c
> index d09d29775b3f..e07e447d08d1 100644
> --- a/drivers/accel/ivpu/ivpu_debugfs.c
> +++ b/drivers/accel/ivpu/ivpu_debugfs.c
> @@ -3,6 +3,8 @@
> * Copyright (C) 2020-2023 Intel Corporation
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_debugfs.h>
> #include <drm/drm_file.h>
> #include <drm/drm_print.h>
> diff --git a/drivers/gpu/drm/armada/armada_debugfs.c b/drivers/gpu/drm/armada/armada_debugfs.c
> index 29f4b52e3c8d..a763349dd89f 100644
> --- a/drivers/gpu/drm/armada/armada_debugfs.c
> +++ b/drivers/gpu/drm/armada/armada_debugfs.c
> @@ -5,6 +5,7 @@
> */
>
> #include <linux/ctype.h>
> +#include <linux/debugfs.h>
> #include <linux/module.h>
> #include <linux/seq_file.h>
> #include <linux/uaccess.h>
> diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
> index 27334173e911..3f68c82888c2 100644
> --- a/drivers/gpu/drm/bridge/ite-it6505.c
> +++ b/drivers/gpu/drm/bridge/ite-it6505.c
> @@ -3,6 +3,7 @@
> * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> */
> #include <linux/bits.h>
> +#include <linux/debugfs.h>
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/err.h>
> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> index 7f41525f7a6e..32506524d9a2 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -4,6 +4,8 @@
> * Copyright (C) 2017 Broadcom
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_bridge.h>
> #include <drm/drm_connector.h>
> diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
> index 699b7dbffd7b..cf2efb44722c 100644
> --- a/drivers/gpu/drm/drm_print.c
> +++ b/drivers/gpu/drm/drm_print.c
> @@ -23,13 +23,13 @@
> * Rob Clark <robdclark@gmail.com>
> */
>
> -#include <linux/stdarg.h>
> -
> +#include <linux/debugfs.h>
> +#include <linux/dynamic_debug.h>
> #include <linux/io.h>
> #include <linux/moduleparam.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> -#include <linux/dynamic_debug.h>
> +#include <linux/stdarg.h>
>
> #include <drm/drm.h>
> #include <drm/drm_drv.h>
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
> index 3697a02b51b6..09346afd1f0e 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -22,6 +22,7 @@
> *
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
>
> #include "i915_drv.h"
> diff --git a/drivers/gpu/drm/imagination/pvr_fw_trace.c b/drivers/gpu/drm/imagination/pvr_fw_trace.c
> index 31199e45b72e..73707daa4e52 100644
> --- a/drivers/gpu/drm/imagination/pvr_fw_trace.c
> +++ b/drivers/gpu/drm/imagination/pvr_fw_trace.c
> @@ -12,6 +12,7 @@
>
> #include <linux/build_bug.h>
> #include <linux/dcache.h>
> +#include <linux/debugfs.h>
> #include <linux/sysfs.h>
> #include <linux/types.h>
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> index 0bf8a83e8df3..8586f2761782 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> @@ -2,6 +2,8 @@
> /* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
> */
>
> +#include <linux/debugfs.h>
> +
> #include "dpu_hwio.h"
> #include "dpu_hw_catalog.h"
> #include "dpu_hw_lm.h"
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> index 9c942fbd836d..5936b6b3b15d 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/crc.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> @@ -1,5 +1,7 @@
> // SPDX-License-Identifier: MIT
> +#include <linux/debugfs.h>
> #include <linux/string.h>
> +
> #include <drm/drm_crtc.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_vblank.h>
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index 86b8b770af19..0b1e19345f43 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
> index 25201b9a5aae..1620f534f55f 100644
> --- a/drivers/gpu/drm/radeon/r300.c
> +++ b/drivers/gpu/drm/radeon/r300.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/pci.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
> index eae8a6389f5e..a979662eaa73 100644
> --- a/drivers/gpu/drm/radeon/r420.c
> +++ b/drivers/gpu/drm/radeon/r420.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/pci.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index b5e97d95a19f..087d41e370fd 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -26,11 +26,12 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> -#include <linux/slab.h>
> #include <linux/seq_file.h>
> +#include <linux/slab.h>
>
> #include <drm/drm_device.h>
> #include <drm/drm_vblank.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
> index 9ebe4a0b9a6c..4fb780d96f32 100644
> --- a/drivers/gpu/drm/radeon/radeon_fence.c
> +++ b/drivers/gpu/drm/radeon/radeon_fence.c
> @@ -30,6 +30,7 @@
> */
>
> #include <linux/atomic.h>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/kref.h>
> #include <linux/sched/signal.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
> index 3fec3acdaf28..2ef201a072f1 100644
> --- a/drivers/gpu/drm/radeon/radeon_gem.c
> +++ b/drivers/gpu/drm/radeon/radeon_gem.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/iosys-map.h>
> #include <linux/pci.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/radeon_ib.c
> index fb9ecf5dbe2b..63d914f3414d 100644
> --- a/drivers/gpu/drm/radeon/radeon_ib.c
> +++ b/drivers/gpu/drm/radeon/radeon_ib.c
> @@ -27,6 +27,8 @@
> * Christian König
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_file.h>
>
> #include "radeon.h"
> diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
> index 4482c8c5f5ce..2d9d9f46f243 100644
> --- a/drivers/gpu/drm/radeon/radeon_pm.c
> +++ b/drivers/gpu/drm/radeon/radeon_pm.c
> @@ -21,6 +21,7 @@
> * Alex Deucher <alexdeucher@gmail.com>
> */
>
> +#include <linux/debugfs.h>
> #include <linux/hwmon-sysfs.h>
> #include <linux/hwmon.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
> index 38048593bb4a..8d1d458286a8 100644
> --- a/drivers/gpu/drm/radeon/radeon_ring.c
> +++ b/drivers/gpu/drm/radeon/radeon_ring.c
> @@ -27,6 +27,8 @@
> * Christian König
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_device.h>
> #include <drm/drm_file.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 2078b0000e22..5c65b6dfb99a 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -30,6 +30,7 @@
> * Dave Airlie
> */
>
> +#include <linux/debugfs.h>
> #include <linux/dma-mapping.h>
> #include <linux/pagemap.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
> index d7f552d441ab..d4d1501e6576 100644
> --- a/drivers/gpu/drm/radeon/rs400.c
> +++ b/drivers/gpu/drm/radeon/rs400.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
> index 79709d26d983..bbc6ccabf788 100644
> --- a/drivers/gpu/drm/radeon/rv515.c
> +++ b/drivers/gpu/drm/radeon/rv515.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
> index 4bab93c4fefd..1799c12babf5 100644
> --- a/drivers/gpu/drm/sti/sti_drv.c
> +++ b/drivers/gpu/drm/sti/sti_drv.c
> @@ -5,6 +5,7 @@
> */
>
> #include <linux/component.h>
> +#include <linux/debugfs.h>
> #include <linux/dma-mapping.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c
> index 76027960054f..434cf0258000 100644
> --- a/drivers/gpu/drm/ttm/ttm_device.c
> +++ b/drivers/gpu/drm/ttm/ttm_device.c
> @@ -27,6 +27,7 @@
>
> #define pr_fmt(fmt) "[TTM DEVICE] " fmt
>
> +#include <linux/debugfs.h>
> #include <linux/mm.h>
>
> #include <drm/ttm/ttm_bo.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c
> index be8d286513f9..4a66b851b67d 100644
> --- a/drivers/gpu/drm/ttm/ttm_resource.c
> +++ b/drivers/gpu/drm/ttm/ttm_resource.c
> @@ -22,8 +22,9 @@
> * Authors: Christian König
> */
>
> -#include <linux/iosys-map.h>
> +#include <linux/debugfs.h>
> #include <linux/io-mapping.h>
> +#include <linux/iosys-map.h>
> #include <linux/scatterlist.h>
>
> #include <drm/ttm/ttm_bo.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
> index 578a7c37f00b..474fe7aad2a0 100644
> --- a/drivers/gpu/drm/ttm/ttm_tt.c
> +++ b/drivers/gpu/drm/ttm/ttm_tt.c
> @@ -32,10 +32,11 @@
> #define pr_fmt(fmt) "[TTM] " fmt
>
> #include <linux/cc_platform.h>
> -#include <linux/sched.h>
> -#include <linux/shmem_fs.h>
> +#include <linux/debugfs.h>
> #include <linux/file.h>
> #include <linux/module.h>
> +#include <linux/sched.h>
> +#include <linux/shmem_fs.h>
> #include <drm/drm_cache.h>
> #include <drm/drm_device.h>
> #include <drm/drm_util.h>
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
> index ab61e96e7e14..08e29fa82563 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.h
> +++ b/drivers/gpu/drm/vc4/vc4_drv.h
> @@ -5,6 +5,7 @@
> #ifndef _VC4_DRV_H_
> #define _VC4_DRV_H_
>
> +#include <linux/debugfs.h>
> #include <linux/delay.h>
> #include <linux/of.h>
> #include <linux/refcount.h>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> index 2132a8ad8c0c..07185c108218 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> @@ -30,6 +30,8 @@
> #include "drm/drm_prime.h"
> #include "drm/drm_gem_ttm_helper.h"
>
> +#include <linux/debugfs.h>
> +
> static void vmw_gem_object_free(struct drm_gem_object *gobj)
> {
> struct ttm_buffer_object *bo = drm_gem_ttm_of_gem(gobj);
> diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
> index c9b30dbdc14d..0b7aebaae843 100644
> --- a/drivers/gpu/drm/xe/xe_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_debugfs.c
> @@ -5,6 +5,7 @@
>
> #include "xe_debugfs.h"
>
> +#include <linux/debugfs.h>
> #include <linux/string_helpers.h>
>
> #include <drm/drm_debugfs.h>
> diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> index ff7f4cf52fa9..8cf0b2625efc 100644
> --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> @@ -5,6 +5,8 @@
>
> #include "xe_gt_debugfs.h"
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_debugfs.h>
> #include <drm/drm_managed.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_uc_debugfs.c b/drivers/gpu/drm/xe/xe_uc_debugfs.c
> index 0a39ec5a6e99..78eb8db73791 100644
> --- a/drivers/gpu/drm/xe/xe_uc_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_uc_debugfs.c
> @@ -3,6 +3,8 @@
> * Copyright © 2022 Intel Corporation
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_debugfs.h>
>
> #include "xe_gt.h"
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 9cc473e5d353..561c3b96b6fd 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -30,11 +30,11 @@
> #include <linux/printk.h>
> #include <linux/seq_file.h>
> #include <linux/device.h>
> -#include <linux/debugfs.h>
> #include <linux/dynamic_debug.h>
>
> #include <drm/drm.h>
>
> +struct debugfs_regset32;
> struct drm_device;
>
> /* Do *not* use outside of drm_print.[ch]! */
> --
> 2.39.2
>
>
Acked-by: Robert Foss <rfoss@kernel.org> #drm/bridge
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
2024-04-22 12:10 Jani Nikula
` (2 preceding siblings ...)
2024-04-24 20:38 ` Lyude Paul
@ 2024-04-24 20:50 ` Lucas De Marchi
2024-04-25 11:36 ` Robert Foss
4 siblings, 0 replies; 11+ messages in thread
From: Lucas De Marchi @ 2024-04-24 20:50 UTC (permalink / raw)
To: Jani Nikula
Cc: dri-devel, Andrzej Hajda, Maxime Ripard, Jacek Lawrynowicz,
Stanislaw Gruszka, Oded Gabbay, Russell King, David Airlie,
Daniel Vetter, Neil Armstrong, Robert Foss, Laurent Pinchart,
Jonas Karlman, Jernej Skrabec, Maarten Lankhorst,
Thomas Zimmermann, Jani Nikula, Rodrigo Vivi, Joonas Lahtinen,
Tvrtko Ursulin, Frank Binns, Matt Coster, Rob Clark,
Abhinav Kumar, Dmitry Baryshkov, Sean Paul, Marijn Suijten,
Karol Herbst, Lyude Paul, Danilo Krummrich, Alex Deucher,
Christian König, Pan, Xinhui, Alain Volmat, Huang Rui,
Zack Rusin, Broadcom internal kernel review list,
Thomas Hellström, intel-gfx, intel-xe, linux-arm-msm,
freedreno, nouveau, amd-gfx
On Mon, Apr 22, 2024 at 03:10:10PM GMT, Jani Nikula wrote:
> drivers/gpu/drm/xe/xe_debugfs.c | 1 +
> drivers/gpu/drm/xe/xe_gt_debugfs.c | 2 ++
> drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 ++
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
thanks
Lucas De Marchi
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
2024-04-22 12:10 Jani Nikula
2024-04-22 13:28 ` Dmitry Baryshkov
2024-04-24 13:54 ` Jani Nikula
@ 2024-04-24 20:38 ` Lyude Paul
2024-04-24 20:50 ` Lucas De Marchi
2024-04-25 11:36 ` Robert Foss
4 siblings, 0 replies; 11+ messages in thread
From: Lyude Paul @ 2024-04-24 20:38 UTC (permalink / raw)
To: Jani Nikula, dri-devel
Cc: Andrzej Hajda, Maxime Ripard, Jacek Lawrynowicz,
Stanislaw Gruszka, Oded Gabbay, Russell King, David Airlie,
Daniel Vetter, Neil Armstrong, Robert Foss, Laurent Pinchart,
Jonas Karlman, Jernej Skrabec, Maarten Lankhorst,
Thomas Zimmermann, Jani Nikula, Rodrigo Vivi, Joonas Lahtinen,
Tvrtko Ursulin, Frank Binns, Matt Coster, Rob Clark,
Abhinav Kumar, Dmitry Baryshkov, Sean Paul, Marijn Suijten,
Karol Herbst, Danilo Krummrich, Alex Deucher,
Christian König, Pan, Xinhui, Alain Volmat, Huang Rui,
Zack Rusin, Broadcom internal kernel review list,
Lucas De Marchi, Thomas Hellström, intel-gfx, intel-xe,
linux-arm-msm, freedreno, nouveau, amd-gfx
For the nouveau bits:
Reviewed-by: Lyude Paul <lyude@redhat.com>
On Mon, 2024-04-22 at 15:10 +0300, Jani Nikula wrote:
> Surprisingly many places depend on debugfs.h to be included via
> drm_print.h. Fix them.
>
> v3: Also fix armada, ite-it6505, imagination, msm, sti, vc4, and xe
>
> v2: Also fix ivpu and vmwgfx
>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> Acked-by: Maxime Ripard <mripard@kernel.org>
> Link:
> https://patchwork.freedesktop.org/patch/msgid/20240410141434.157908-1-jani.nikula@intel.com
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> ---
>
> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> Cc: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
> Cc: Oded Gabbay <ogabbay@kernel.org>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Andrzej Hajda <andrzej.hajda@intel.com>
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: Robert Foss <rfoss@kernel.org>
> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
> Cc: Jonas Karlman <jonas@kwiboo.se>
> Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tursulin@ursulin.net>
> Cc: Frank Binns <frank.binns@imgtec.com>
> Cc: Matt Coster <matt.coster@imgtec.com>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Cc: Sean Paul <sean@poorly.run>
> Cc: Marijn Suijten <marijn.suijten@somainline.org>
> Cc: Karol Herbst <kherbst@redhat.com>
> Cc: Lyude Paul <lyude@redhat.com>
> Cc: Danilo Krummrich <dakr@redhat.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> Cc: Alain Volmat <alain.volmat@foss.st.com>
> Cc: Huang Rui <ray.huang@amd.com>
> Cc: Zack Rusin <zack.rusin@broadcom.com>
> Cc: Broadcom internal kernel review list
> <bcm-kernel-feedback-list@broadcom.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: intel-gfx@lists.freedesktop.org
> Cc: intel-xe@lists.freedesktop.org
> Cc: linux-arm-msm@vger.kernel.org
> Cc: freedreno@lists.freedesktop.org
> Cc: nouveau@lists.freedesktop.org
> Cc: amd-gfx@lists.freedesktop.org
> ---
> drivers/accel/ivpu/ivpu_debugfs.c | 2 ++
> drivers/gpu/drm/armada/armada_debugfs.c | 1 +
> drivers/gpu/drm/bridge/ite-it6505.c | 1 +
> drivers/gpu/drm/bridge/panel.c | 2 ++
> drivers/gpu/drm/drm_print.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_dmc.c | 1 +
> drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 +
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 ++
> drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 ++
> drivers/gpu/drm/radeon/r100.c | 1 +
> drivers/gpu/drm/radeon/r300.c | 1 +
> drivers/gpu/drm/radeon/r420.c | 1 +
> drivers/gpu/drm/radeon/r600.c | 3 ++-
> drivers/gpu/drm/radeon/radeon_fence.c | 1 +
> drivers/gpu/drm/radeon/radeon_gem.c | 1 +
> drivers/gpu/drm/radeon/radeon_ib.c | 2 ++
> drivers/gpu/drm/radeon/radeon_pm.c | 1 +
> drivers/gpu/drm/radeon/radeon_ring.c | 2 ++
> drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
> drivers/gpu/drm/radeon/rs400.c | 1 +
> drivers/gpu/drm/radeon/rv515.c | 1 +
> drivers/gpu/drm/sti/sti_drv.c | 1 +
> drivers/gpu/drm/ttm/ttm_device.c | 1 +
> drivers/gpu/drm/ttm/ttm_resource.c | 3 ++-
> drivers/gpu/drm/ttm/ttm_tt.c | 5 +++--
> drivers/gpu/drm/vc4/vc4_drv.h | 1 +
> drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 ++
> drivers/gpu/drm/xe/xe_debugfs.c | 1 +
> drivers/gpu/drm/xe/xe_gt_debugfs.c | 2 ++
> drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 ++
> include/drm/drm_print.h | 2 +-
> 31 files changed, 46 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/accel/ivpu/ivpu_debugfs.c
> b/drivers/accel/ivpu/ivpu_debugfs.c
> index d09d29775b3f..e07e447d08d1 100644
> --- a/drivers/accel/ivpu/ivpu_debugfs.c
> +++ b/drivers/accel/ivpu/ivpu_debugfs.c
> @@ -3,6 +3,8 @@
> * Copyright (C) 2020-2023 Intel Corporation
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_debugfs.h>
> #include <drm/drm_file.h>
> #include <drm/drm_print.h>
> diff --git a/drivers/gpu/drm/armada/armada_debugfs.c
> b/drivers/gpu/drm/armada/armada_debugfs.c
> index 29f4b52e3c8d..a763349dd89f 100644
> --- a/drivers/gpu/drm/armada/armada_debugfs.c
> +++ b/drivers/gpu/drm/armada/armada_debugfs.c
> @@ -5,6 +5,7 @@
> */
>
> #include <linux/ctype.h>
> +#include <linux/debugfs.h>
> #include <linux/module.h>
> #include <linux/seq_file.h>
> #include <linux/uaccess.h>
> diff --git a/drivers/gpu/drm/bridge/ite-it6505.c
> b/drivers/gpu/drm/bridge/ite-it6505.c
> index 27334173e911..3f68c82888c2 100644
> --- a/drivers/gpu/drm/bridge/ite-it6505.c
> +++ b/drivers/gpu/drm/bridge/ite-it6505.c
> @@ -3,6 +3,7 @@
> * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> */
> #include <linux/bits.h>
> +#include <linux/debugfs.h>
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/err.h>
> diff --git a/drivers/gpu/drm/bridge/panel.c
> b/drivers/gpu/drm/bridge/panel.c
> index 7f41525f7a6e..32506524d9a2 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -4,6 +4,8 @@
> * Copyright (C) 2017 Broadcom
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_bridge.h>
> #include <drm/drm_connector.h>
> diff --git a/drivers/gpu/drm/drm_print.c
> b/drivers/gpu/drm/drm_print.c
> index 699b7dbffd7b..cf2efb44722c 100644
> --- a/drivers/gpu/drm/drm_print.c
> +++ b/drivers/gpu/drm/drm_print.c
> @@ -23,13 +23,13 @@
> * Rob Clark <robdclark@gmail.com>
> */
>
> -#include <linux/stdarg.h>
> -
> +#include <linux/debugfs.h>
> +#include <linux/dynamic_debug.h>
> #include <linux/io.h>
> #include <linux/moduleparam.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> -#include <linux/dynamic_debug.h>
> +#include <linux/stdarg.h>
>
> #include <drm/drm.h>
> #include <drm/drm_drv.h>
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c
> b/drivers/gpu/drm/i915/display/intel_dmc.c
> index 3697a02b51b6..09346afd1f0e 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -22,6 +22,7 @@
> *
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
>
> #include "i915_drv.h"
> diff --git a/drivers/gpu/drm/imagination/pvr_fw_trace.c
> b/drivers/gpu/drm/imagination/pvr_fw_trace.c
> index 31199e45b72e..73707daa4e52 100644
> --- a/drivers/gpu/drm/imagination/pvr_fw_trace.c
> +++ b/drivers/gpu/drm/imagination/pvr_fw_trace.c
> @@ -12,6 +12,7 @@
>
> #include <linux/build_bug.h>
> #include <linux/dcache.h>
> +#include <linux/debugfs.h>
> #include <linux/sysfs.h>
> #include <linux/types.h>
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> index 0bf8a83e8df3..8586f2761782 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> @@ -2,6 +2,8 @@
> /* Copyright (c) 2015-2018, The Linux Foundation. All rights
> reserved.
> */
>
> +#include <linux/debugfs.h>
> +
> #include "dpu_hwio.h"
> #include "dpu_hw_catalog.h"
> #include "dpu_hw_lm.h"
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c
> b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> index 9c942fbd836d..5936b6b3b15d 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/crc.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> @@ -1,5 +1,7 @@
> // SPDX-License-Identifier: MIT
> +#include <linux/debugfs.h>
> #include <linux/string.h>
> +
> #include <drm/drm_crtc.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_vblank.h>
> diff --git a/drivers/gpu/drm/radeon/r100.c
> b/drivers/gpu/drm/radeon/r100.c
> index 86b8b770af19..0b1e19345f43 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/r300.c
> b/drivers/gpu/drm/radeon/r300.c
> index 25201b9a5aae..1620f534f55f 100644
> --- a/drivers/gpu/drm/radeon/r300.c
> +++ b/drivers/gpu/drm/radeon/r300.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/pci.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> diff --git a/drivers/gpu/drm/radeon/r420.c
> b/drivers/gpu/drm/radeon/r420.c
> index eae8a6389f5e..a979662eaa73 100644
> --- a/drivers/gpu/drm/radeon/r420.c
> +++ b/drivers/gpu/drm/radeon/r420.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/pci.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> diff --git a/drivers/gpu/drm/radeon/r600.c
> b/drivers/gpu/drm/radeon/r600.c
> index b5e97d95a19f..087d41e370fd 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -26,11 +26,12 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> -#include <linux/slab.h>
> #include <linux/seq_file.h>
> +#include <linux/slab.h>
>
> #include <drm/drm_device.h>
> #include <drm/drm_vblank.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_fence.c
> b/drivers/gpu/drm/radeon/radeon_fence.c
> index 9ebe4a0b9a6c..4fb780d96f32 100644
> --- a/drivers/gpu/drm/radeon/radeon_fence.c
> +++ b/drivers/gpu/drm/radeon/radeon_fence.c
> @@ -30,6 +30,7 @@
> */
>
> #include <linux/atomic.h>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/kref.h>
> #include <linux/sched/signal.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_gem.c
> b/drivers/gpu/drm/radeon/radeon_gem.c
> index 3fec3acdaf28..2ef201a072f1 100644
> --- a/drivers/gpu/drm/radeon/radeon_gem.c
> +++ b/drivers/gpu/drm/radeon/radeon_gem.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/iosys-map.h>
> #include <linux/pci.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ib.c
> b/drivers/gpu/drm/radeon/radeon_ib.c
> index fb9ecf5dbe2b..63d914f3414d 100644
> --- a/drivers/gpu/drm/radeon/radeon_ib.c
> +++ b/drivers/gpu/drm/radeon/radeon_ib.c
> @@ -27,6 +27,8 @@
> * Christian König
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_file.h>
>
> #include "radeon.h"
> diff --git a/drivers/gpu/drm/radeon/radeon_pm.c
> b/drivers/gpu/drm/radeon/radeon_pm.c
> index 4482c8c5f5ce..2d9d9f46f243 100644
> --- a/drivers/gpu/drm/radeon/radeon_pm.c
> +++ b/drivers/gpu/drm/radeon/radeon_pm.c
> @@ -21,6 +21,7 @@
> * Alex Deucher <alexdeucher@gmail.com>
> */
>
> +#include <linux/debugfs.h>
> #include <linux/hwmon-sysfs.h>
> #include <linux/hwmon.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c
> b/drivers/gpu/drm/radeon/radeon_ring.c
> index 38048593bb4a..8d1d458286a8 100644
> --- a/drivers/gpu/drm/radeon/radeon_ring.c
> +++ b/drivers/gpu/drm/radeon/radeon_ring.c
> @@ -27,6 +27,8 @@
> * Christian König
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_device.h>
> #include <drm/drm_file.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c
> b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 2078b0000e22..5c65b6dfb99a 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -30,6 +30,7 @@
> * Dave Airlie
> */
>
> +#include <linux/debugfs.h>
> #include <linux/dma-mapping.h>
> #include <linux/pagemap.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/rs400.c
> b/drivers/gpu/drm/radeon/rs400.c
> index d7f552d441ab..d4d1501e6576 100644
> --- a/drivers/gpu/drm/radeon/rs400.c
> +++ b/drivers/gpu/drm/radeon/rs400.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/radeon/rv515.c
> b/drivers/gpu/drm/radeon/rv515.c
> index 79709d26d983..bbc6ccabf788 100644
> --- a/drivers/gpu/drm/radeon/rv515.c
> +++ b/drivers/gpu/drm/radeon/rv515.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/sti/sti_drv.c
> b/drivers/gpu/drm/sti/sti_drv.c
> index 4bab93c4fefd..1799c12babf5 100644
> --- a/drivers/gpu/drm/sti/sti_drv.c
> +++ b/drivers/gpu/drm/sti/sti_drv.c
> @@ -5,6 +5,7 @@
> */
>
> #include <linux/component.h>
> +#include <linux/debugfs.h>
> #include <linux/dma-mapping.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_device.c
> b/drivers/gpu/drm/ttm/ttm_device.c
> index 76027960054f..434cf0258000 100644
> --- a/drivers/gpu/drm/ttm/ttm_device.c
> +++ b/drivers/gpu/drm/ttm/ttm_device.c
> @@ -27,6 +27,7 @@
>
> #define pr_fmt(fmt) "[TTM DEVICE] " fmt
>
> +#include <linux/debugfs.h>
> #include <linux/mm.h>
>
> #include <drm/ttm/ttm_bo.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_resource.c
> b/drivers/gpu/drm/ttm/ttm_resource.c
> index be8d286513f9..4a66b851b67d 100644
> --- a/drivers/gpu/drm/ttm/ttm_resource.c
> +++ b/drivers/gpu/drm/ttm/ttm_resource.c
> @@ -22,8 +22,9 @@
> * Authors: Christian König
> */
>
> -#include <linux/iosys-map.h>
> +#include <linux/debugfs.h>
> #include <linux/io-mapping.h>
> +#include <linux/iosys-map.h>
> #include <linux/scatterlist.h>
>
> #include <drm/ttm/ttm_bo.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_tt.c
> b/drivers/gpu/drm/ttm/ttm_tt.c
> index 578a7c37f00b..474fe7aad2a0 100644
> --- a/drivers/gpu/drm/ttm/ttm_tt.c
> +++ b/drivers/gpu/drm/ttm/ttm_tt.c
> @@ -32,10 +32,11 @@
> #define pr_fmt(fmt) "[TTM] " fmt
>
> #include <linux/cc_platform.h>
> -#include <linux/sched.h>
> -#include <linux/shmem_fs.h>
> +#include <linux/debugfs.h>
> #include <linux/file.h>
> #include <linux/module.h>
> +#include <linux/sched.h>
> +#include <linux/shmem_fs.h>
> #include <drm/drm_cache.h>
> #include <drm/drm_device.h>
> #include <drm/drm_util.h>
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.h
> b/drivers/gpu/drm/vc4/vc4_drv.h
> index ab61e96e7e14..08e29fa82563 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.h
> +++ b/drivers/gpu/drm/vc4/vc4_drv.h
> @@ -5,6 +5,7 @@
> #ifndef _VC4_DRV_H_
> #define _VC4_DRV_H_
>
> +#include <linux/debugfs.h>
> #include <linux/delay.h>
> #include <linux/of.h>
> #include <linux/refcount.h>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> index 2132a8ad8c0c..07185c108218 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> @@ -30,6 +30,8 @@
> #include "drm/drm_prime.h"
> #include "drm/drm_gem_ttm_helper.h"
>
> +#include <linux/debugfs.h>
> +
> static void vmw_gem_object_free(struct drm_gem_object *gobj)
> {
> struct ttm_buffer_object *bo = drm_gem_ttm_of_gem(gobj);
> diff --git a/drivers/gpu/drm/xe/xe_debugfs.c
> b/drivers/gpu/drm/xe/xe_debugfs.c
> index c9b30dbdc14d..0b7aebaae843 100644
> --- a/drivers/gpu/drm/xe/xe_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_debugfs.c
> @@ -5,6 +5,7 @@
>
> #include "xe_debugfs.h"
>
> +#include <linux/debugfs.h>
> #include <linux/string_helpers.h>
>
> #include <drm/drm_debugfs.h>
> diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> index ff7f4cf52fa9..8cf0b2625efc 100644
> --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> @@ -5,6 +5,8 @@
>
> #include "xe_gt_debugfs.h"
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_debugfs.h>
> #include <drm/drm_managed.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_uc_debugfs.c
> b/drivers/gpu/drm/xe/xe_uc_debugfs.c
> index 0a39ec5a6e99..78eb8db73791 100644
> --- a/drivers/gpu/drm/xe/xe_uc_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_uc_debugfs.c
> @@ -3,6 +3,8 @@
> * Copyright © 2022 Intel Corporation
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_debugfs.h>
>
> #include "xe_gt.h"
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 9cc473e5d353..561c3b96b6fd 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -30,11 +30,11 @@
> #include <linux/printk.h>
> #include <linux/seq_file.h>
> #include <linux/device.h>
> -#include <linux/debugfs.h>
> #include <linux/dynamic_debug.h>
>
> #include <drm/drm.h>
>
> +struct debugfs_regset32;
> struct drm_device;
>
> /* Do *not* use outside of drm_print.[ch]! */
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
2024-04-24 13:54 ` Jani Nikula
@ 2024-04-24 18:56 ` Deucher, Alexander
0 siblings, 0 replies; 11+ messages in thread
From: Deucher, Alexander @ 2024-04-24 18:56 UTC (permalink / raw)
To: Jani Nikula, dri-devel
Cc: Andrzej Hajda, Maxime Ripard, Jacek Lawrynowicz,
Stanislaw Gruszka, Oded Gabbay, Russell King, David Airlie,
Daniel Vetter, Neil Armstrong, Robert Foss, Laurent Pinchart,
Jonas Karlman, Jernej Skrabec, Maarten Lankhorst,
Thomas Zimmermann, Rodrigo Vivi, Joonas Lahtinen, Tvrtko Ursulin,
Frank Binns, Matt Coster, Rob Clark, Abhinav Kumar,
Dmitry Baryshkov, Sean Paul, Marijn Suijten, Karol Herbst,
Lyude Paul, Danilo Krummrich, Koenig, Christian, Pan, Xinhui,
Alain Volmat, Huang, Ray, Zack Rusin,
Broadcom internal kernel review list, Lucas De Marchi,
Thomas Hellström, intel-gfx, intel-xe, linux-arm-msm,
freedreno, nouveau, amd-gfx
[Public]
> -----Original Message-----
> From: Jani Nikula <jani.nikula@intel.com>
> Sent: Wednesday, April 24, 2024 9:55 AM
> To: dri-devel@lists.freedesktop.org
> Cc: Andrzej Hajda <andrzej.hajda@intel.com>; Maxime Ripard
> <mripard@kernel.org>; Jacek Lawrynowicz
> <jacek.lawrynowicz@linux.intel.com>; Stanislaw Gruszka
> <stanislaw.gruszka@linux.intel.com>; Oded Gabbay <ogabbay@kernel.org>;
> Russell King <linux@armlinux.org.uk>; David Airlie <airlied@gmail.com>; Daniel
> Vetter <daniel@ffwll.ch>; Neil Armstrong <neil.armstrong@linaro.org>; Robert
> Foss <rfoss@kernel.org>; Laurent Pinchart
> <Laurent.pinchart@ideasonboard.com>; Jonas Karlman <jonas@kwiboo.se>;
> Jernej Skrabec <jernej.skrabec@gmail.com>; Maarten Lankhorst
> <maarten.lankhorst@linux.intel.com>; Thomas Zimmermann
> <tzimmermann@suse.de>; Rodrigo Vivi <rodrigo.vivi@intel.com>; Joonas
> Lahtinen <joonas.lahtinen@linux.intel.com>; Tvrtko Ursulin
> <tursulin@ursulin.net>; Frank Binns <frank.binns@imgtec.com>; Matt Coster
> <matt.coster@imgtec.com>; Rob Clark <robdclark@gmail.com>; Abhinav
> Kumar <quic_abhinavk@quicinc.com>; Dmitry Baryshkov
> <dmitry.baryshkov@linaro.org>; Sean Paul <sean@poorly.run>; Marijn Suijten
> <marijn.suijten@somainline.org>; Karol Herbst <kherbst@redhat.com>; Lyude
> Paul <lyude@redhat.com>; Danilo Krummrich <dakr@redhat.com>; Deucher,
> Alexander <Alexander.Deucher@amd.com>; Koenig, Christian
> <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; Alain
> Volmat <alain.volmat@foss.st.com>; Huang, Ray <Ray.Huang@amd.com>;
> Zack Rusin <zack.rusin@broadcom.com>; Broadcom internal kernel review list
> <bcm-kernel-feedback-list@broadcom.com>; Lucas De Marchi
> <lucas.demarchi@intel.com>; Thomas Hellström
> <thomas.hellstrom@linux.intel.com>; intel-gfx@lists.freedesktop.org; intel-
> xe@lists.freedesktop.org; linux-arm-msm@vger.kernel.org;
> freedreno@lists.freedesktop.org; nouveau@lists.freedesktop.org; amd-
> gfx@lists.freedesktop.org
> Subject: Re: [PATCH 1/2] drm/print: drop include debugfs.h and include where
> needed
>
> On Mon, 22 Apr 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> > Surprisingly many places depend on debugfs.h to be included via
> > drm_print.h. Fix them.
> >
> > v3: Also fix armada, ite-it6505, imagination, msm, sti, vc4, and xe
> >
> > v2: Also fix ivpu and vmwgfx
> >
> > Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> > Acked-by: Maxime Ripard <mripard@kernel.org>
> > Link:
> >
> https://patchwork.freedesktop.org/patch/msgid/20240410141434.157908
> -1-
> > jani.nikula@intel.com
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> While the changes all over the place are small, mostly just adding the
> debugfs.h include, please consider acking. I've sent this a few times already.
>
For radeon:
Acked-by: Alex Deucher <alexander.deucher@amd.com>
> Otherwise, I'll merge this by the end of the week, acks or not.
>
> Thanks,
> Jani.
>
>
>
> >
> > ---
> >
> > Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> > Cc: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
> > Cc: Oded Gabbay <ogabbay@kernel.org>
> > Cc: Russell King <linux@armlinux.org.uk>
> > Cc: David Airlie <airlied@gmail.com>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Cc: Andrzej Hajda <andrzej.hajda@intel.com>
> > Cc: Neil Armstrong <neil.armstrong@linaro.org>
> > Cc: Robert Foss <rfoss@kernel.org>
> > Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
> > Cc: Jonas Karlman <jonas@kwiboo.se>
> > Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Cc: Maxime Ripard <mripard@kernel.org>
> > Cc: Thomas Zimmermann <tzimmermann@suse.de>
> > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > Cc: Tvrtko Ursulin <tursulin@ursulin.net>
> > Cc: Frank Binns <frank.binns@imgtec.com>
> > Cc: Matt Coster <matt.coster@imgtec.com>
> > Cc: Rob Clark <robdclark@gmail.com>
> > Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
> > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > Cc: Sean Paul <sean@poorly.run>
> > Cc: Marijn Suijten <marijn.suijten@somainline.org>
> > Cc: Karol Herbst <kherbst@redhat.com>
> > Cc: Lyude Paul <lyude@redhat.com>
> > Cc: Danilo Krummrich <dakr@redhat.com>
> > Cc: Alex Deucher <alexander.deucher@amd.com>
> > Cc: "Christian König" <christian.koenig@amd.com>
> > Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> > Cc: Alain Volmat <alain.volmat@foss.st.com>
> > Cc: Huang Rui <ray.huang@amd.com>
> > Cc: Zack Rusin <zack.rusin@broadcom.com>
> > Cc: Broadcom internal kernel review list
> > <bcm-kernel-feedback-list@broadcom.com>
> > Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> > Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
> > Cc: dri-devel@lists.freedesktop.org
> > Cc: intel-gfx@lists.freedesktop.org
> > Cc: intel-xe@lists.freedesktop.org
> > Cc: linux-arm-msm@vger.kernel.org
> > Cc: freedreno@lists.freedesktop.org
> > Cc: nouveau@lists.freedesktop.org
> > Cc: amd-gfx@lists.freedesktop.org
> > ---
> > drivers/accel/ivpu/ivpu_debugfs.c | 2 ++
> > drivers/gpu/drm/armada/armada_debugfs.c | 1 +
> > drivers/gpu/drm/bridge/ite-it6505.c | 1 +
> > drivers/gpu/drm/bridge/panel.c | 2 ++
> > drivers/gpu/drm/drm_print.c | 6 +++---
> > drivers/gpu/drm/i915/display/intel_dmc.c | 1 +
> > drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 +
> > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 ++
> > drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 ++
> > drivers/gpu/drm/radeon/r100.c | 1 +
> > drivers/gpu/drm/radeon/r300.c | 1 +
> > drivers/gpu/drm/radeon/r420.c | 1 +
> > drivers/gpu/drm/radeon/r600.c | 3 ++-
> > drivers/gpu/drm/radeon/radeon_fence.c | 1 +
> > drivers/gpu/drm/radeon/radeon_gem.c | 1 +
> > drivers/gpu/drm/radeon/radeon_ib.c | 2 ++
> > drivers/gpu/drm/radeon/radeon_pm.c | 1 +
> > drivers/gpu/drm/radeon/radeon_ring.c | 2 ++
> > drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
> > drivers/gpu/drm/radeon/rs400.c | 1 +
> > drivers/gpu/drm/radeon/rv515.c | 1 +
> > drivers/gpu/drm/sti/sti_drv.c | 1 +
> > drivers/gpu/drm/ttm/ttm_device.c | 1 +
> > drivers/gpu/drm/ttm/ttm_resource.c | 3 ++-
> > drivers/gpu/drm/ttm/ttm_tt.c | 5 +++--
> > drivers/gpu/drm/vc4/vc4_drv.h | 1 +
> > drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 ++
> > drivers/gpu/drm/xe/xe_debugfs.c | 1 +
> > drivers/gpu/drm/xe/xe_gt_debugfs.c | 2 ++
> > drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 ++
> > include/drm/drm_print.h | 2 +-
> > 31 files changed, 46 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/accel/ivpu/ivpu_debugfs.c
> > b/drivers/accel/ivpu/ivpu_debugfs.c
> > index d09d29775b3f..e07e447d08d1 100644
> > --- a/drivers/accel/ivpu/ivpu_debugfs.c
> > +++ b/drivers/accel/ivpu/ivpu_debugfs.c
> > @@ -3,6 +3,8 @@
> > * Copyright (C) 2020-2023 Intel Corporation
> > */
> >
> > +#include <linux/debugfs.h>
> > +
> > #include <drm/drm_debugfs.h>
> > #include <drm/drm_file.h>
> > #include <drm/drm_print.h>
> > diff --git a/drivers/gpu/drm/armada/armada_debugfs.c
> > b/drivers/gpu/drm/armada/armada_debugfs.c
> > index 29f4b52e3c8d..a763349dd89f 100644
> > --- a/drivers/gpu/drm/armada/armada_debugfs.c
> > +++ b/drivers/gpu/drm/armada/armada_debugfs.c
> > @@ -5,6 +5,7 @@
> > */
> >
> > #include <linux/ctype.h>
> > +#include <linux/debugfs.h>
> > #include <linux/module.h>
> > #include <linux/seq_file.h>
> > #include <linux/uaccess.h>
> > diff --git a/drivers/gpu/drm/bridge/ite-it6505.c
> > b/drivers/gpu/drm/bridge/ite-it6505.c
> > index 27334173e911..3f68c82888c2 100644
> > --- a/drivers/gpu/drm/bridge/ite-it6505.c
> > +++ b/drivers/gpu/drm/bridge/ite-it6505.c
> > @@ -3,6 +3,7 @@
> > * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> > */
> > #include <linux/bits.h>
> > +#include <linux/debugfs.h>
> > #include <linux/delay.h>
> > #include <linux/device.h>
> > #include <linux/err.h>
> > diff --git a/drivers/gpu/drm/bridge/panel.c
> > b/drivers/gpu/drm/bridge/panel.c index 7f41525f7a6e..32506524d9a2
> > 100644
> > --- a/drivers/gpu/drm/bridge/panel.c
> > +++ b/drivers/gpu/drm/bridge/panel.c
> > @@ -4,6 +4,8 @@
> > * Copyright (C) 2017 Broadcom
> > */
> >
> > +#include <linux/debugfs.h>
> > +
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_bridge.h>
> > #include <drm/drm_connector.h>
> > diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
> > index 699b7dbffd7b..cf2efb44722c 100644
> > --- a/drivers/gpu/drm/drm_print.c
> > +++ b/drivers/gpu/drm/drm_print.c
> > @@ -23,13 +23,13 @@
> > * Rob Clark <robdclark@gmail.com>
> > */
> >
> > -#include <linux/stdarg.h>
> > -
> > +#include <linux/debugfs.h>
> > +#include <linux/dynamic_debug.h>
> > #include <linux/io.h>
> > #include <linux/moduleparam.h>
> > #include <linux/seq_file.h>
> > #include <linux/slab.h>
> > -#include <linux/dynamic_debug.h>
> > +#include <linux/stdarg.h>
> >
> > #include <drm/drm.h>
> > #include <drm/drm_drv.h>
> > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c
> > b/drivers/gpu/drm/i915/display/intel_dmc.c
> > index 3697a02b51b6..09346afd1f0e 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> > @@ -22,6 +22,7 @@
> > *
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/firmware.h>
> >
> > #include "i915_drv.h"
> > diff --git a/drivers/gpu/drm/imagination/pvr_fw_trace.c
> > b/drivers/gpu/drm/imagination/pvr_fw_trace.c
> > index 31199e45b72e..73707daa4e52 100644
> > --- a/drivers/gpu/drm/imagination/pvr_fw_trace.c
> > +++ b/drivers/gpu/drm/imagination/pvr_fw_trace.c
> > @@ -12,6 +12,7 @@
> >
> > #include <linux/build_bug.h>
> > #include <linux/dcache.h>
> > +#include <linux/debugfs.h>
> > #include <linux/sysfs.h>
> > #include <linux/types.h>
> >
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> > index 0bf8a83e8df3..8586f2761782 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> > @@ -2,6 +2,8 @@
> > /* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
> > */
> >
> > +#include <linux/debugfs.h>
> > +
> > #include "dpu_hwio.h"
> > #include "dpu_hw_catalog.h"
> > #include "dpu_hw_lm.h"
> > diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c
> > b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> > index 9c942fbd836d..5936b6b3b15d 100644
> > --- a/drivers/gpu/drm/nouveau/dispnv50/crc.c
> > +++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> > @@ -1,5 +1,7 @@
> > // SPDX-License-Identifier: MIT
> > +#include <linux/debugfs.h>
> > #include <linux/string.h>
> > +
> > #include <drm/drm_crtc.h>
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_vblank.h>
> > diff --git a/drivers/gpu/drm/radeon/r100.c
> > b/drivers/gpu/drm/radeon/r100.c index 86b8b770af19..0b1e19345f43
> > 100644
> > --- a/drivers/gpu/drm/radeon/r100.c
> > +++ b/drivers/gpu/drm/radeon/r100.c
> > @@ -26,6 +26,7 @@
> > * Jerome Glisse
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/firmware.h>
> > #include <linux/module.h>
> > #include <linux/pci.h>
> > diff --git a/drivers/gpu/drm/radeon/r300.c
> > b/drivers/gpu/drm/radeon/r300.c index 25201b9a5aae..1620f534f55f
> > 100644
> > --- a/drivers/gpu/drm/radeon/r300.c
> > +++ b/drivers/gpu/drm/radeon/r300.c
> > @@ -26,6 +26,7 @@
> > * Jerome Glisse
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/pci.h>
> > #include <linux/seq_file.h>
> > #include <linux/slab.h>
> > diff --git a/drivers/gpu/drm/radeon/r420.c
> > b/drivers/gpu/drm/radeon/r420.c index eae8a6389f5e..a979662eaa73
> > 100644
> > --- a/drivers/gpu/drm/radeon/r420.c
> > +++ b/drivers/gpu/drm/radeon/r420.c
> > @@ -26,6 +26,7 @@
> > * Jerome Glisse
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/pci.h>
> > #include <linux/seq_file.h>
> > #include <linux/slab.h>
> > diff --git a/drivers/gpu/drm/radeon/r600.c
> > b/drivers/gpu/drm/radeon/r600.c index b5e97d95a19f..087d41e370fd
> > 100644
> > --- a/drivers/gpu/drm/radeon/r600.c
> > +++ b/drivers/gpu/drm/radeon/r600.c
> > @@ -26,11 +26,12 @@
> > * Jerome Glisse
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/firmware.h>
> > #include <linux/module.h>
> > #include <linux/pci.h>
> > -#include <linux/slab.h>
> > #include <linux/seq_file.h>
> > +#include <linux/slab.h>
> >
> > #include <drm/drm_device.h>
> > #include <drm/drm_vblank.h>
> > diff --git a/drivers/gpu/drm/radeon/radeon_fence.c
> > b/drivers/gpu/drm/radeon/radeon_fence.c
> > index 9ebe4a0b9a6c..4fb780d96f32 100644
> > --- a/drivers/gpu/drm/radeon/radeon_fence.c
> > +++ b/drivers/gpu/drm/radeon/radeon_fence.c
> > @@ -30,6 +30,7 @@
> > */
> >
> > #include <linux/atomic.h>
> > +#include <linux/debugfs.h>
> > #include <linux/firmware.h>
> > #include <linux/kref.h>
> > #include <linux/sched/signal.h>
> > diff --git a/drivers/gpu/drm/radeon/radeon_gem.c
> > b/drivers/gpu/drm/radeon/radeon_gem.c
> > index 3fec3acdaf28..2ef201a072f1 100644
> > --- a/drivers/gpu/drm/radeon/radeon_gem.c
> > +++ b/drivers/gpu/drm/radeon/radeon_gem.c
> > @@ -26,6 +26,7 @@
> > * Jerome Glisse
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/iosys-map.h>
> > #include <linux/pci.h>
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon_ib.c
> > b/drivers/gpu/drm/radeon/radeon_ib.c
> > index fb9ecf5dbe2b..63d914f3414d 100644
> > --- a/drivers/gpu/drm/radeon/radeon_ib.c
> > +++ b/drivers/gpu/drm/radeon/radeon_ib.c
> > @@ -27,6 +27,8 @@
> > * Christian König
> > */
> >
> > +#include <linux/debugfs.h>
> > +
> > #include <drm/drm_file.h>
> >
> > #include "radeon.h"
> > diff --git a/drivers/gpu/drm/radeon/radeon_pm.c
> > b/drivers/gpu/drm/radeon/radeon_pm.c
> > index 4482c8c5f5ce..2d9d9f46f243 100644
> > --- a/drivers/gpu/drm/radeon/radeon_pm.c
> > +++ b/drivers/gpu/drm/radeon/radeon_pm.c
> > @@ -21,6 +21,7 @@
> > * Alex Deucher <alexdeucher@gmail.com>
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/hwmon-sysfs.h>
> > #include <linux/hwmon.h>
> > #include <linux/pci.h>
> > diff --git a/drivers/gpu/drm/radeon/radeon_ring.c
> > b/drivers/gpu/drm/radeon/radeon_ring.c
> > index 38048593bb4a..8d1d458286a8 100644
> > --- a/drivers/gpu/drm/radeon/radeon_ring.c
> > +++ b/drivers/gpu/drm/radeon/radeon_ring.c
> > @@ -27,6 +27,8 @@
> > * Christian König
> > */
> >
> > +#include <linux/debugfs.h>
> > +
> > #include <drm/drm_device.h>
> > #include <drm/drm_file.h>
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c
> > b/drivers/gpu/drm/radeon/radeon_ttm.c
> > index 2078b0000e22..5c65b6dfb99a 100644
> > --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> > @@ -30,6 +30,7 @@
> > * Dave Airlie
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/dma-mapping.h>
> > #include <linux/pagemap.h>
> > #include <linux/pci.h>
> > diff --git a/drivers/gpu/drm/radeon/rs400.c
> > b/drivers/gpu/drm/radeon/rs400.c index d7f552d441ab..d4d1501e6576
> > 100644
> > --- a/drivers/gpu/drm/radeon/rs400.c
> > +++ b/drivers/gpu/drm/radeon/rs400.c
> > @@ -26,6 +26,7 @@
> > * Jerome Glisse
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/seq_file.h>
> > #include <linux/slab.h>
> >
> > diff --git a/drivers/gpu/drm/radeon/rv515.c
> > b/drivers/gpu/drm/radeon/rv515.c index 79709d26d983..bbc6ccabf788
> > 100644
> > --- a/drivers/gpu/drm/radeon/rv515.c
> > +++ b/drivers/gpu/drm/radeon/rv515.c
> > @@ -26,6 +26,7 @@
> > * Jerome Glisse
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/seq_file.h>
> > #include <linux/slab.h>
> >
> > diff --git a/drivers/gpu/drm/sti/sti_drv.c
> > b/drivers/gpu/drm/sti/sti_drv.c index 4bab93c4fefd..1799c12babf5
> > 100644
> > --- a/drivers/gpu/drm/sti/sti_drv.c
> > +++ b/drivers/gpu/drm/sti/sti_drv.c
> > @@ -5,6 +5,7 @@
> > */
> >
> > #include <linux/component.h>
> > +#include <linux/debugfs.h>
> > #include <linux/dma-mapping.h>
> > #include <linux/kernel.h>
> > #include <linux/module.h>
> > diff --git a/drivers/gpu/drm/ttm/ttm_device.c
> > b/drivers/gpu/drm/ttm/ttm_device.c
> > index 76027960054f..434cf0258000 100644
> > --- a/drivers/gpu/drm/ttm/ttm_device.c
> > +++ b/drivers/gpu/drm/ttm/ttm_device.c
> > @@ -27,6 +27,7 @@
> >
> > #define pr_fmt(fmt) "[TTM DEVICE] " fmt
> >
> > +#include <linux/debugfs.h>
> > #include <linux/mm.h>
> >
> > #include <drm/ttm/ttm_bo.h>
> > diff --git a/drivers/gpu/drm/ttm/ttm_resource.c
> > b/drivers/gpu/drm/ttm/ttm_resource.c
> > index be8d286513f9..4a66b851b67d 100644
> > --- a/drivers/gpu/drm/ttm/ttm_resource.c
> > +++ b/drivers/gpu/drm/ttm/ttm_resource.c
> > @@ -22,8 +22,9 @@
> > * Authors: Christian König
> > */
> >
> > -#include <linux/iosys-map.h>
> > +#include <linux/debugfs.h>
> > #include <linux/io-mapping.h>
> > +#include <linux/iosys-map.h>
> > #include <linux/scatterlist.h>
> >
> > #include <drm/ttm/ttm_bo.h>
> > diff --git a/drivers/gpu/drm/ttm/ttm_tt.c
> > b/drivers/gpu/drm/ttm/ttm_tt.c index 578a7c37f00b..474fe7aad2a0
> 100644
> > --- a/drivers/gpu/drm/ttm/ttm_tt.c
> > +++ b/drivers/gpu/drm/ttm/ttm_tt.c
> > @@ -32,10 +32,11 @@
> > #define pr_fmt(fmt) "[TTM] " fmt
> >
> > #include <linux/cc_platform.h>
> > -#include <linux/sched.h>
> > -#include <linux/shmem_fs.h>
> > +#include <linux/debugfs.h>
> > #include <linux/file.h>
> > #include <linux/module.h>
> > +#include <linux/sched.h>
> > +#include <linux/shmem_fs.h>
> > #include <drm/drm_cache.h>
> > #include <drm/drm_device.h>
> > #include <drm/drm_util.h>
> > diff --git a/drivers/gpu/drm/vc4/vc4_drv.h
> > b/drivers/gpu/drm/vc4/vc4_drv.h index ab61e96e7e14..08e29fa82563
> > 100644
> > --- a/drivers/gpu/drm/vc4/vc4_drv.h
> > +++ b/drivers/gpu/drm/vc4/vc4_drv.h
> > @@ -5,6 +5,7 @@
> > #ifndef _VC4_DRV_H_
> > #define _VC4_DRV_H_
> >
> > +#include <linux/debugfs.h>
> > #include <linux/delay.h>
> > #include <linux/of.h>
> > #include <linux/refcount.h>
> > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> > b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> > index 2132a8ad8c0c..07185c108218 100644
> > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> > @@ -30,6 +30,8 @@
> > #include "drm/drm_prime.h"
> > #include "drm/drm_gem_ttm_helper.h"
> >
> > +#include <linux/debugfs.h>
> > +
> > static void vmw_gem_object_free(struct drm_gem_object *gobj) {
> > struct ttm_buffer_object *bo = drm_gem_ttm_of_gem(gobj); diff --git
> > a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
> > index c9b30dbdc14d..0b7aebaae843 100644
> > --- a/drivers/gpu/drm/xe/xe_debugfs.c
> > +++ b/drivers/gpu/drm/xe/xe_debugfs.c
> > @@ -5,6 +5,7 @@
> >
> > #include "xe_debugfs.h"
> >
> > +#include <linux/debugfs.h>
> > #include <linux/string_helpers.h>
> >
> > #include <drm/drm_debugfs.h>
> > diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> > b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> > index ff7f4cf52fa9..8cf0b2625efc 100644
> > --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> > +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> > @@ -5,6 +5,8 @@
> >
> > #include "xe_gt_debugfs.h"
> >
> > +#include <linux/debugfs.h>
> > +
> > #include <drm/drm_debugfs.h>
> > #include <drm/drm_managed.h>
> >
> > diff --git a/drivers/gpu/drm/xe/xe_uc_debugfs.c
> > b/drivers/gpu/drm/xe/xe_uc_debugfs.c
> > index 0a39ec5a6e99..78eb8db73791 100644
> > --- a/drivers/gpu/drm/xe/xe_uc_debugfs.c
> > +++ b/drivers/gpu/drm/xe/xe_uc_debugfs.c
> > @@ -3,6 +3,8 @@
> > * Copyright © 2022 Intel Corporation
> > */
> >
> > +#include <linux/debugfs.h>
> > +
> > #include <drm/drm_debugfs.h>
> >
> > #include "xe_gt.h"
> > diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index
> > 9cc473e5d353..561c3b96b6fd 100644
> > --- a/include/drm/drm_print.h
> > +++ b/include/drm/drm_print.h
> > @@ -30,11 +30,11 @@
> > #include <linux/printk.h>
> > #include <linux/seq_file.h>
> > #include <linux/device.h>
> > -#include <linux/debugfs.h>
> > #include <linux/dynamic_debug.h>
> >
> > #include <drm/drm.h>
> >
> > +struct debugfs_regset32;
> > struct drm_device;
> >
> > /* Do *not* use outside of drm_print.[ch]! */
>
> --
> Jani Nikula, Intel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
2024-04-22 12:10 Jani Nikula
2024-04-22 13:28 ` Dmitry Baryshkov
@ 2024-04-24 13:54 ` Jani Nikula
2024-04-24 18:56 ` Deucher, Alexander
2024-04-24 20:38 ` Lyude Paul
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Jani Nikula @ 2024-04-24 13:54 UTC (permalink / raw)
To: dri-devel
Cc: Andrzej Hajda, Maxime Ripard, Jacek Lawrynowicz,
Stanislaw Gruszka, Oded Gabbay, Russell King, David Airlie,
Daniel Vetter, Neil Armstrong, Robert Foss, Laurent Pinchart,
Jonas Karlman, Jernej Skrabec, Maarten Lankhorst,
Thomas Zimmermann, Rodrigo Vivi, Joonas Lahtinen, Tvrtko Ursulin,
Frank Binns, Matt Coster, Rob Clark, Abhinav Kumar,
Dmitry Baryshkov, Sean Paul, Marijn Suijten, Karol Herbst,
Lyude Paul, Danilo Krummrich, Alex Deucher, Christian König,
Pan, Xinhui, Alain Volmat, Huang Rui, Zack Rusin,
Broadcom internal kernel review list, Lucas De Marchi,
Thomas Hellström, intel-gfx, intel-xe, linux-arm-msm,
freedreno, nouveau, amd-gfx
On Mon, 22 Apr 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> Surprisingly many places depend on debugfs.h to be included via
> drm_print.h. Fix them.
>
> v3: Also fix armada, ite-it6505, imagination, msm, sti, vc4, and xe
>
> v2: Also fix ivpu and vmwgfx
>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> Acked-by: Maxime Ripard <mripard@kernel.org>
> Link: https://patchwork.freedesktop.org/patch/msgid/20240410141434.157908-1-jani.nikula@intel.com
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
While the changes all over the place are small, mostly just adding the
debugfs.h include, please consider acking. I've sent this a few times
already.
Otherwise, I'll merge this by the end of the week, acks or not.
Thanks,
Jani.
>
> ---
>
> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> Cc: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
> Cc: Oded Gabbay <ogabbay@kernel.org>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Andrzej Hajda <andrzej.hajda@intel.com>
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: Robert Foss <rfoss@kernel.org>
> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
> Cc: Jonas Karlman <jonas@kwiboo.se>
> Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tursulin@ursulin.net>
> Cc: Frank Binns <frank.binns@imgtec.com>
> Cc: Matt Coster <matt.coster@imgtec.com>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Cc: Sean Paul <sean@poorly.run>
> Cc: Marijn Suijten <marijn.suijten@somainline.org>
> Cc: Karol Herbst <kherbst@redhat.com>
> Cc: Lyude Paul <lyude@redhat.com>
> Cc: Danilo Krummrich <dakr@redhat.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> Cc: Alain Volmat <alain.volmat@foss.st.com>
> Cc: Huang Rui <ray.huang@amd.com>
> Cc: Zack Rusin <zack.rusin@broadcom.com>
> Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: intel-gfx@lists.freedesktop.org
> Cc: intel-xe@lists.freedesktop.org
> Cc: linux-arm-msm@vger.kernel.org
> Cc: freedreno@lists.freedesktop.org
> Cc: nouveau@lists.freedesktop.org
> Cc: amd-gfx@lists.freedesktop.org
> ---
> drivers/accel/ivpu/ivpu_debugfs.c | 2 ++
> drivers/gpu/drm/armada/armada_debugfs.c | 1 +
> drivers/gpu/drm/bridge/ite-it6505.c | 1 +
> drivers/gpu/drm/bridge/panel.c | 2 ++
> drivers/gpu/drm/drm_print.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_dmc.c | 1 +
> drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 +
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 ++
> drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 ++
> drivers/gpu/drm/radeon/r100.c | 1 +
> drivers/gpu/drm/radeon/r300.c | 1 +
> drivers/gpu/drm/radeon/r420.c | 1 +
> drivers/gpu/drm/radeon/r600.c | 3 ++-
> drivers/gpu/drm/radeon/radeon_fence.c | 1 +
> drivers/gpu/drm/radeon/radeon_gem.c | 1 +
> drivers/gpu/drm/radeon/radeon_ib.c | 2 ++
> drivers/gpu/drm/radeon/radeon_pm.c | 1 +
> drivers/gpu/drm/radeon/radeon_ring.c | 2 ++
> drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
> drivers/gpu/drm/radeon/rs400.c | 1 +
> drivers/gpu/drm/radeon/rv515.c | 1 +
> drivers/gpu/drm/sti/sti_drv.c | 1 +
> drivers/gpu/drm/ttm/ttm_device.c | 1 +
> drivers/gpu/drm/ttm/ttm_resource.c | 3 ++-
> drivers/gpu/drm/ttm/ttm_tt.c | 5 +++--
> drivers/gpu/drm/vc4/vc4_drv.h | 1 +
> drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 ++
> drivers/gpu/drm/xe/xe_debugfs.c | 1 +
> drivers/gpu/drm/xe/xe_gt_debugfs.c | 2 ++
> drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 ++
> include/drm/drm_print.h | 2 +-
> 31 files changed, 46 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/accel/ivpu/ivpu_debugfs.c b/drivers/accel/ivpu/ivpu_debugfs.c
> index d09d29775b3f..e07e447d08d1 100644
> --- a/drivers/accel/ivpu/ivpu_debugfs.c
> +++ b/drivers/accel/ivpu/ivpu_debugfs.c
> @@ -3,6 +3,8 @@
> * Copyright (C) 2020-2023 Intel Corporation
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_debugfs.h>
> #include <drm/drm_file.h>
> #include <drm/drm_print.h>
> diff --git a/drivers/gpu/drm/armada/armada_debugfs.c b/drivers/gpu/drm/armada/armada_debugfs.c
> index 29f4b52e3c8d..a763349dd89f 100644
> --- a/drivers/gpu/drm/armada/armada_debugfs.c
> +++ b/drivers/gpu/drm/armada/armada_debugfs.c
> @@ -5,6 +5,7 @@
> */
>
> #include <linux/ctype.h>
> +#include <linux/debugfs.h>
> #include <linux/module.h>
> #include <linux/seq_file.h>
> #include <linux/uaccess.h>
> diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
> index 27334173e911..3f68c82888c2 100644
> --- a/drivers/gpu/drm/bridge/ite-it6505.c
> +++ b/drivers/gpu/drm/bridge/ite-it6505.c
> @@ -3,6 +3,7 @@
> * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> */
> #include <linux/bits.h>
> +#include <linux/debugfs.h>
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/err.h>
> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> index 7f41525f7a6e..32506524d9a2 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -4,6 +4,8 @@
> * Copyright (C) 2017 Broadcom
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_bridge.h>
> #include <drm/drm_connector.h>
> diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
> index 699b7dbffd7b..cf2efb44722c 100644
> --- a/drivers/gpu/drm/drm_print.c
> +++ b/drivers/gpu/drm/drm_print.c
> @@ -23,13 +23,13 @@
> * Rob Clark <robdclark@gmail.com>
> */
>
> -#include <linux/stdarg.h>
> -
> +#include <linux/debugfs.h>
> +#include <linux/dynamic_debug.h>
> #include <linux/io.h>
> #include <linux/moduleparam.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> -#include <linux/dynamic_debug.h>
> +#include <linux/stdarg.h>
>
> #include <drm/drm.h>
> #include <drm/drm_drv.h>
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
> index 3697a02b51b6..09346afd1f0e 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -22,6 +22,7 @@
> *
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
>
> #include "i915_drv.h"
> diff --git a/drivers/gpu/drm/imagination/pvr_fw_trace.c b/drivers/gpu/drm/imagination/pvr_fw_trace.c
> index 31199e45b72e..73707daa4e52 100644
> --- a/drivers/gpu/drm/imagination/pvr_fw_trace.c
> +++ b/drivers/gpu/drm/imagination/pvr_fw_trace.c
> @@ -12,6 +12,7 @@
>
> #include <linux/build_bug.h>
> #include <linux/dcache.h>
> +#include <linux/debugfs.h>
> #include <linux/sysfs.h>
> #include <linux/types.h>
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> index 0bf8a83e8df3..8586f2761782 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> @@ -2,6 +2,8 @@
> /* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
> */
>
> +#include <linux/debugfs.h>
> +
> #include "dpu_hwio.h"
> #include "dpu_hw_catalog.h"
> #include "dpu_hw_lm.h"
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> index 9c942fbd836d..5936b6b3b15d 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/crc.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c
> @@ -1,5 +1,7 @@
> // SPDX-License-Identifier: MIT
> +#include <linux/debugfs.h>
> #include <linux/string.h>
> +
> #include <drm/drm_crtc.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_vblank.h>
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index 86b8b770af19..0b1e19345f43 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
> index 25201b9a5aae..1620f534f55f 100644
> --- a/drivers/gpu/drm/radeon/r300.c
> +++ b/drivers/gpu/drm/radeon/r300.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/pci.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
> index eae8a6389f5e..a979662eaa73 100644
> --- a/drivers/gpu/drm/radeon/r420.c
> +++ b/drivers/gpu/drm/radeon/r420.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/pci.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index b5e97d95a19f..087d41e370fd 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -26,11 +26,12 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> -#include <linux/slab.h>
> #include <linux/seq_file.h>
> +#include <linux/slab.h>
>
> #include <drm/drm_device.h>
> #include <drm/drm_vblank.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
> index 9ebe4a0b9a6c..4fb780d96f32 100644
> --- a/drivers/gpu/drm/radeon/radeon_fence.c
> +++ b/drivers/gpu/drm/radeon/radeon_fence.c
> @@ -30,6 +30,7 @@
> */
>
> #include <linux/atomic.h>
> +#include <linux/debugfs.h>
> #include <linux/firmware.h>
> #include <linux/kref.h>
> #include <linux/sched/signal.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
> index 3fec3acdaf28..2ef201a072f1 100644
> --- a/drivers/gpu/drm/radeon/radeon_gem.c
> +++ b/drivers/gpu/drm/radeon/radeon_gem.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/iosys-map.h>
> #include <linux/pci.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/radeon_ib.c
> index fb9ecf5dbe2b..63d914f3414d 100644
> --- a/drivers/gpu/drm/radeon/radeon_ib.c
> +++ b/drivers/gpu/drm/radeon/radeon_ib.c
> @@ -27,6 +27,8 @@
> * Christian König
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_file.h>
>
> #include "radeon.h"
> diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
> index 4482c8c5f5ce..2d9d9f46f243 100644
> --- a/drivers/gpu/drm/radeon/radeon_pm.c
> +++ b/drivers/gpu/drm/radeon/radeon_pm.c
> @@ -21,6 +21,7 @@
> * Alex Deucher <alexdeucher@gmail.com>
> */
>
> +#include <linux/debugfs.h>
> #include <linux/hwmon-sysfs.h>
> #include <linux/hwmon.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
> index 38048593bb4a..8d1d458286a8 100644
> --- a/drivers/gpu/drm/radeon/radeon_ring.c
> +++ b/drivers/gpu/drm/radeon/radeon_ring.c
> @@ -27,6 +27,8 @@
> * Christian König
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_device.h>
> #include <drm/drm_file.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 2078b0000e22..5c65b6dfb99a 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -30,6 +30,7 @@
> * Dave Airlie
> */
>
> +#include <linux/debugfs.h>
> #include <linux/dma-mapping.h>
> #include <linux/pagemap.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
> index d7f552d441ab..d4d1501e6576 100644
> --- a/drivers/gpu/drm/radeon/rs400.c
> +++ b/drivers/gpu/drm/radeon/rs400.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
> index 79709d26d983..bbc6ccabf788 100644
> --- a/drivers/gpu/drm/radeon/rv515.c
> +++ b/drivers/gpu/drm/radeon/rv515.c
> @@ -26,6 +26,7 @@
> * Jerome Glisse
> */
>
> +#include <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
> index 4bab93c4fefd..1799c12babf5 100644
> --- a/drivers/gpu/drm/sti/sti_drv.c
> +++ b/drivers/gpu/drm/sti/sti_drv.c
> @@ -5,6 +5,7 @@
> */
>
> #include <linux/component.h>
> +#include <linux/debugfs.h>
> #include <linux/dma-mapping.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c
> index 76027960054f..434cf0258000 100644
> --- a/drivers/gpu/drm/ttm/ttm_device.c
> +++ b/drivers/gpu/drm/ttm/ttm_device.c
> @@ -27,6 +27,7 @@
>
> #define pr_fmt(fmt) "[TTM DEVICE] " fmt
>
> +#include <linux/debugfs.h>
> #include <linux/mm.h>
>
> #include <drm/ttm/ttm_bo.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c
> index be8d286513f9..4a66b851b67d 100644
> --- a/drivers/gpu/drm/ttm/ttm_resource.c
> +++ b/drivers/gpu/drm/ttm/ttm_resource.c
> @@ -22,8 +22,9 @@
> * Authors: Christian König
> */
>
> -#include <linux/iosys-map.h>
> +#include <linux/debugfs.h>
> #include <linux/io-mapping.h>
> +#include <linux/iosys-map.h>
> #include <linux/scatterlist.h>
>
> #include <drm/ttm/ttm_bo.h>
> diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
> index 578a7c37f00b..474fe7aad2a0 100644
> --- a/drivers/gpu/drm/ttm/ttm_tt.c
> +++ b/drivers/gpu/drm/ttm/ttm_tt.c
> @@ -32,10 +32,11 @@
> #define pr_fmt(fmt) "[TTM] " fmt
>
> #include <linux/cc_platform.h>
> -#include <linux/sched.h>
> -#include <linux/shmem_fs.h>
> +#include <linux/debugfs.h>
> #include <linux/file.h>
> #include <linux/module.h>
> +#include <linux/sched.h>
> +#include <linux/shmem_fs.h>
> #include <drm/drm_cache.h>
> #include <drm/drm_device.h>
> #include <drm/drm_util.h>
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
> index ab61e96e7e14..08e29fa82563 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.h
> +++ b/drivers/gpu/drm/vc4/vc4_drv.h
> @@ -5,6 +5,7 @@
> #ifndef _VC4_DRV_H_
> #define _VC4_DRV_H_
>
> +#include <linux/debugfs.h>
> #include <linux/delay.h>
> #include <linux/of.h>
> #include <linux/refcount.h>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> index 2132a8ad8c0c..07185c108218 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
> @@ -30,6 +30,8 @@
> #include "drm/drm_prime.h"
> #include "drm/drm_gem_ttm_helper.h"
>
> +#include <linux/debugfs.h>
> +
> static void vmw_gem_object_free(struct drm_gem_object *gobj)
> {
> struct ttm_buffer_object *bo = drm_gem_ttm_of_gem(gobj);
> diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
> index c9b30dbdc14d..0b7aebaae843 100644
> --- a/drivers/gpu/drm/xe/xe_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_debugfs.c
> @@ -5,6 +5,7 @@
>
> #include "xe_debugfs.h"
>
> +#include <linux/debugfs.h>
> #include <linux/string_helpers.h>
>
> #include <drm/drm_debugfs.h>
> diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> index ff7f4cf52fa9..8cf0b2625efc 100644
> --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> @@ -5,6 +5,8 @@
>
> #include "xe_gt_debugfs.h"
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_debugfs.h>
> #include <drm/drm_managed.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_uc_debugfs.c b/drivers/gpu/drm/xe/xe_uc_debugfs.c
> index 0a39ec5a6e99..78eb8db73791 100644
> --- a/drivers/gpu/drm/xe/xe_uc_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_uc_debugfs.c
> @@ -3,6 +3,8 @@
> * Copyright © 2022 Intel Corporation
> */
>
> +#include <linux/debugfs.h>
> +
> #include <drm/drm_debugfs.h>
>
> #include "xe_gt.h"
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 9cc473e5d353..561c3b96b6fd 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -30,11 +30,11 @@
> #include <linux/printk.h>
> #include <linux/seq_file.h>
> #include <linux/device.h>
> -#include <linux/debugfs.h>
> #include <linux/dynamic_debug.h>
>
> #include <drm/drm.h>
>
> +struct debugfs_regset32;
> struct drm_device;
>
> /* Do *not* use outside of drm_print.[ch]! */
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
2024-04-22 12:10 Jani Nikula
@ 2024-04-22 13:28 ` Dmitry Baryshkov
2024-04-24 13:54 ` Jani Nikula
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Dmitry Baryshkov @ 2024-04-22 13:28 UTC (permalink / raw)
To: Jani Nikula
Cc: dri-devel, Andrzej Hajda, Maxime Ripard, Jacek Lawrynowicz,
Stanislaw Gruszka, Oded Gabbay, Russell King, David Airlie,
Daniel Vetter, Neil Armstrong, Robert Foss, Laurent Pinchart,
Jonas Karlman, Jernej Skrabec, Maarten Lankhorst,
Thomas Zimmermann, Jani Nikula, Rodrigo Vivi, Joonas Lahtinen,
Tvrtko Ursulin, Frank Binns, Matt Coster, Rob Clark,
Abhinav Kumar, Sean Paul, Marijn Suijten, Karol Herbst,
Lyude Paul, Danilo Krummrich, Alex Deucher, Christian König,
Pan, Xinhui, Alain Volmat, Huang Rui, Zack Rusin,
Broadcom internal kernel review list, Lucas De Marchi,
Thomas Hellström, intel-gfx, intel-xe, linux-arm-msm,
freedreno, nouveau, amd-gfx
On Mon, Apr 22, 2024 at 03:10:10PM +0300, Jani Nikula wrote:
> Surprisingly many places depend on debugfs.h to be included via
> drm_print.h. Fix them.
>
> v3: Also fix armada, ite-it6505, imagination, msm, sti, vc4, and xe
>
> v2: Also fix ivpu and vmwgfx
>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> Acked-by: Maxime Ripard <mripard@kernel.org>
> Link: https://patchwork.freedesktop.org/patch/msgid/20240410141434.157908-1-jani.nikula@intel.com
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> ---
>
> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> Cc: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
> Cc: Oded Gabbay <ogabbay@kernel.org>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Andrzej Hajda <andrzej.hajda@intel.com>
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: Robert Foss <rfoss@kernel.org>
> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
> Cc: Jonas Karlman <jonas@kwiboo.se>
> Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tursulin@ursulin.net>
> Cc: Frank Binns <frank.binns@imgtec.com>
> Cc: Matt Coster <matt.coster@imgtec.com>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Cc: Sean Paul <sean@poorly.run>
> Cc: Marijn Suijten <marijn.suijten@somainline.org>
> Cc: Karol Herbst <kherbst@redhat.com>
> Cc: Lyude Paul <lyude@redhat.com>
> Cc: Danilo Krummrich <dakr@redhat.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> Cc: Alain Volmat <alain.volmat@foss.st.com>
> Cc: Huang Rui <ray.huang@amd.com>
> Cc: Zack Rusin <zack.rusin@broadcom.com>
> Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: intel-gfx@lists.freedesktop.org
> Cc: intel-xe@lists.freedesktop.org
> Cc: linux-arm-msm@vger.kernel.org
> Cc: freedreno@lists.freedesktop.org
> Cc: nouveau@lists.freedesktop.org
> Cc: amd-gfx@lists.freedesktop.org
> ---
> drivers/accel/ivpu/ivpu_debugfs.c | 2 ++
> drivers/gpu/drm/armada/armada_debugfs.c | 1 +
> drivers/gpu/drm/bridge/ite-it6505.c | 1 +
> drivers/gpu/drm/bridge/panel.c | 2 ++
> drivers/gpu/drm/drm_print.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_dmc.c | 1 +
> drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 +
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 ++
Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> # drm/msm
> drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 ++
> drivers/gpu/drm/radeon/r100.c | 1 +
> drivers/gpu/drm/radeon/r300.c | 1 +
> drivers/gpu/drm/radeon/r420.c | 1 +
> drivers/gpu/drm/radeon/r600.c | 3 ++-
> drivers/gpu/drm/radeon/radeon_fence.c | 1 +
> drivers/gpu/drm/radeon/radeon_gem.c | 1 +
> drivers/gpu/drm/radeon/radeon_ib.c | 2 ++
> drivers/gpu/drm/radeon/radeon_pm.c | 1 +
> drivers/gpu/drm/radeon/radeon_ring.c | 2 ++
> drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
> drivers/gpu/drm/radeon/rs400.c | 1 +
> drivers/gpu/drm/radeon/rv515.c | 1 +
> drivers/gpu/drm/sti/sti_drv.c | 1 +
> drivers/gpu/drm/ttm/ttm_device.c | 1 +
> drivers/gpu/drm/ttm/ttm_resource.c | 3 ++-
> drivers/gpu/drm/ttm/ttm_tt.c | 5 +++--
> drivers/gpu/drm/vc4/vc4_drv.h | 1 +
> drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 ++
> drivers/gpu/drm/xe/xe_debugfs.c | 1 +
> drivers/gpu/drm/xe/xe_gt_debugfs.c | 2 ++
> drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 ++
> include/drm/drm_print.h | 2 +-
> 31 files changed, 46 insertions(+), 8 deletions(-)
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/2] drm/print: drop include debugfs.h and include where needed
@ 2024-04-22 12:10 Jani Nikula
2024-04-22 13:28 ` Dmitry Baryshkov
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Jani Nikula @ 2024-04-22 12:10 UTC (permalink / raw)
To: dri-devel
Cc: jani.nikula, Andrzej Hajda, Maxime Ripard, Jacek Lawrynowicz,
Stanislaw Gruszka, Oded Gabbay, Russell King, David Airlie,
Daniel Vetter, Neil Armstrong, Robert Foss, Laurent Pinchart,
Jonas Karlman, Jernej Skrabec, Maarten Lankhorst,
Thomas Zimmermann, Jani Nikula, Rodrigo Vivi, Joonas Lahtinen,
Tvrtko Ursulin, Frank Binns, Matt Coster, Rob Clark,
Abhinav Kumar, Dmitry Baryshkov, Sean Paul, Marijn Suijten,
Karol Herbst, Lyude Paul, Danilo Krummrich, Alex Deucher,
Christian König, Pan, Xinhui, Alain Volmat, Huang Rui,
Zack Rusin, Broadcom internal kernel review list,
Lucas De Marchi, Thomas Hellström, intel-gfx, intel-xe,
linux-arm-msm, freedreno, nouveau, amd-gfx
Surprisingly many places depend on debugfs.h to be included via
drm_print.h. Fix them.
v3: Also fix armada, ite-it6505, imagination, msm, sti, vc4, and xe
v2: Also fix ivpu and vmwgfx
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Acked-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240410141434.157908-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Cc: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Cc: Oded Gabbay <ogabbay@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Robert Foss <rfoss@kernel.org>
Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Jonas Karlman <jonas@kwiboo.se>
Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tursulin@ursulin.net>
Cc: Frank Binns <frank.binns@imgtec.com>
Cc: Matt Coster <matt.coster@imgtec.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Sean Paul <sean@poorly.run>
Cc: Marijn Suijten <marijn.suijten@somainline.org>
Cc: Karol Herbst <kherbst@redhat.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Danilo Krummrich <dakr@redhat.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Cc: Alain Volmat <alain.volmat@foss.st.com>
Cc: Huang Rui <ray.huang@amd.com>
Cc: Zack Rusin <zack.rusin@broadcom.com>
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Cc: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
---
drivers/accel/ivpu/ivpu_debugfs.c | 2 ++
drivers/gpu/drm/armada/armada_debugfs.c | 1 +
drivers/gpu/drm/bridge/ite-it6505.c | 1 +
drivers/gpu/drm/bridge/panel.c | 2 ++
drivers/gpu/drm/drm_print.c | 6 +++---
drivers/gpu/drm/i915/display/intel_dmc.c | 1 +
drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 +
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 ++
drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 ++
drivers/gpu/drm/radeon/r100.c | 1 +
drivers/gpu/drm/radeon/r300.c | 1 +
drivers/gpu/drm/radeon/r420.c | 1 +
drivers/gpu/drm/radeon/r600.c | 3 ++-
drivers/gpu/drm/radeon/radeon_fence.c | 1 +
drivers/gpu/drm/radeon/radeon_gem.c | 1 +
drivers/gpu/drm/radeon/radeon_ib.c | 2 ++
drivers/gpu/drm/radeon/radeon_pm.c | 1 +
drivers/gpu/drm/radeon/radeon_ring.c | 2 ++
drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
drivers/gpu/drm/radeon/rs400.c | 1 +
drivers/gpu/drm/radeon/rv515.c | 1 +
drivers/gpu/drm/sti/sti_drv.c | 1 +
drivers/gpu/drm/ttm/ttm_device.c | 1 +
drivers/gpu/drm/ttm/ttm_resource.c | 3 ++-
drivers/gpu/drm/ttm/ttm_tt.c | 5 +++--
drivers/gpu/drm/vc4/vc4_drv.h | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 ++
drivers/gpu/drm/xe/xe_debugfs.c | 1 +
drivers/gpu/drm/xe/xe_gt_debugfs.c | 2 ++
drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 ++
include/drm/drm_print.h | 2 +-
31 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/drivers/accel/ivpu/ivpu_debugfs.c b/drivers/accel/ivpu/ivpu_debugfs.c
index d09d29775b3f..e07e447d08d1 100644
--- a/drivers/accel/ivpu/ivpu_debugfs.c
+++ b/drivers/accel/ivpu/ivpu_debugfs.c
@@ -3,6 +3,8 @@
* Copyright (C) 2020-2023 Intel Corporation
*/
+#include <linux/debugfs.h>
+
#include <drm/drm_debugfs.h>
#include <drm/drm_file.h>
#include <drm/drm_print.h>
diff --git a/drivers/gpu/drm/armada/armada_debugfs.c b/drivers/gpu/drm/armada/armada_debugfs.c
index 29f4b52e3c8d..a763349dd89f 100644
--- a/drivers/gpu/drm/armada/armada_debugfs.c
+++ b/drivers/gpu/drm/armada/armada_debugfs.c
@@ -5,6 +5,7 @@
*/
#include <linux/ctype.h>
+#include <linux/debugfs.h>
#include <linux/module.h>
#include <linux/seq_file.h>
#include <linux/uaccess.h>
diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
index 27334173e911..3f68c82888c2 100644
--- a/drivers/gpu/drm/bridge/ite-it6505.c
+++ b/drivers/gpu/drm/bridge/ite-it6505.c
@@ -3,6 +3,7 @@
* Copyright (c) 2020, The Linux Foundation. All rights reserved.
*/
#include <linux/bits.h>
+#include <linux/debugfs.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/err.h>
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 7f41525f7a6e..32506524d9a2 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -4,6 +4,8 @@
* Copyright (C) 2017 Broadcom
*/
+#include <linux/debugfs.h>
+
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
#include <drm/drm_connector.h>
diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 699b7dbffd7b..cf2efb44722c 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -23,13 +23,13 @@
* Rob Clark <robdclark@gmail.com>
*/
-#include <linux/stdarg.h>
-
+#include <linux/debugfs.h>
+#include <linux/dynamic_debug.h>
#include <linux/io.h>
#include <linux/moduleparam.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
-#include <linux/dynamic_debug.h>
+#include <linux/stdarg.h>
#include <drm/drm.h>
#include <drm/drm_drv.h>
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 3697a02b51b6..09346afd1f0e 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -22,6 +22,7 @@
*
*/
+#include <linux/debugfs.h>
#include <linux/firmware.h>
#include "i915_drv.h"
diff --git a/drivers/gpu/drm/imagination/pvr_fw_trace.c b/drivers/gpu/drm/imagination/pvr_fw_trace.c
index 31199e45b72e..73707daa4e52 100644
--- a/drivers/gpu/drm/imagination/pvr_fw_trace.c
+++ b/drivers/gpu/drm/imagination/pvr_fw_trace.c
@@ -12,6 +12,7 @@
#include <linux/build_bug.h>
#include <linux/dcache.h>
+#include <linux/debugfs.h>
#include <linux/sysfs.h>
#include <linux/types.h>
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
index 0bf8a83e8df3..8586f2761782 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
@@ -2,6 +2,8 @@
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
*/
+#include <linux/debugfs.h>
+
#include "dpu_hwio.h"
#include "dpu_hw_catalog.h"
#include "dpu_hw_lm.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c b/drivers/gpu/drm/nouveau/dispnv50/crc.c
index 9c942fbd836d..5936b6b3b15d 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/crc.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c
@@ -1,5 +1,7 @@
// SPDX-License-Identifier: MIT
+#include <linux/debugfs.h>
#include <linux/string.h>
+
#include <drm/drm_crtc.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_vblank.h>
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 86b8b770af19..0b1e19345f43 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/firmware.h>
#include <linux/module.h>
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 25201b9a5aae..1620f534f55f 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/pci.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index eae8a6389f5e..a979662eaa73 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/pci.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index b5e97d95a19f..087d41e370fd 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -26,11 +26,12 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/firmware.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/slab.h>
#include <linux/seq_file.h>
+#include <linux/slab.h>
#include <drm/drm_device.h>
#include <drm/drm_vblank.h>
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 9ebe4a0b9a6c..4fb780d96f32 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -30,6 +30,7 @@
*/
#include <linux/atomic.h>
+#include <linux/debugfs.h>
#include <linux/firmware.h>
#include <linux/kref.h>
#include <linux/sched/signal.h>
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 3fec3acdaf28..2ef201a072f1 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/iosys-map.h>
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/radeon_ib.c
index fb9ecf5dbe2b..63d914f3414d 100644
--- a/drivers/gpu/drm/radeon/radeon_ib.c
+++ b/drivers/gpu/drm/radeon/radeon_ib.c
@@ -27,6 +27,8 @@
* Christian König
*/
+#include <linux/debugfs.h>
+
#include <drm/drm_file.h>
#include "radeon.h"
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 4482c8c5f5ce..2d9d9f46f243 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -21,6 +21,7 @@
* Alex Deucher <alexdeucher@gmail.com>
*/
+#include <linux/debugfs.h>
#include <linux/hwmon-sysfs.h>
#include <linux/hwmon.h>
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 38048593bb4a..8d1d458286a8 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -27,6 +27,8 @@
* Christian König
*/
+#include <linux/debugfs.h>
+
#include <drm/drm_device.h>
#include <drm/drm_file.h>
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 2078b0000e22..5c65b6dfb99a 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -30,6 +30,7 @@
* Dave Airlie
*/
+#include <linux/debugfs.h>
#include <linux/dma-mapping.h>
#include <linux/pagemap.h>
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index d7f552d441ab..d4d1501e6576 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 79709d26d983..bbc6ccabf788 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -26,6 +26,7 @@
* Jerome Glisse
*/
+#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
index 4bab93c4fefd..1799c12babf5 100644
--- a/drivers/gpu/drm/sti/sti_drv.c
+++ b/drivers/gpu/drm/sti/sti_drv.c
@@ -5,6 +5,7 @@
*/
#include <linux/component.h>
+#include <linux/debugfs.h>
#include <linux/dma-mapping.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c
index 76027960054f..434cf0258000 100644
--- a/drivers/gpu/drm/ttm/ttm_device.c
+++ b/drivers/gpu/drm/ttm/ttm_device.c
@@ -27,6 +27,7 @@
#define pr_fmt(fmt) "[TTM DEVICE] " fmt
+#include <linux/debugfs.h>
#include <linux/mm.h>
#include <drm/ttm/ttm_bo.h>
diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c
index be8d286513f9..4a66b851b67d 100644
--- a/drivers/gpu/drm/ttm/ttm_resource.c
+++ b/drivers/gpu/drm/ttm/ttm_resource.c
@@ -22,8 +22,9 @@
* Authors: Christian König
*/
-#include <linux/iosys-map.h>
+#include <linux/debugfs.h>
#include <linux/io-mapping.h>
+#include <linux/iosys-map.h>
#include <linux/scatterlist.h>
#include <drm/ttm/ttm_bo.h>
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 578a7c37f00b..474fe7aad2a0 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -32,10 +32,11 @@
#define pr_fmt(fmt) "[TTM] " fmt
#include <linux/cc_platform.h>
-#include <linux/sched.h>
-#include <linux/shmem_fs.h>
+#include <linux/debugfs.h>
#include <linux/file.h>
#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/shmem_fs.h>
#include <drm/drm_cache.h>
#include <drm/drm_device.h>
#include <drm/drm_util.h>
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index ab61e96e7e14..08e29fa82563 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -5,6 +5,7 @@
#ifndef _VC4_DRV_H_
#define _VC4_DRV_H_
+#include <linux/debugfs.h>
#include <linux/delay.h>
#include <linux/of.h>
#include <linux/refcount.h>
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
index 2132a8ad8c0c..07185c108218 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
@@ -30,6 +30,8 @@
#include "drm/drm_prime.h"
#include "drm/drm_gem_ttm_helper.h"
+#include <linux/debugfs.h>
+
static void vmw_gem_object_free(struct drm_gem_object *gobj)
{
struct ttm_buffer_object *bo = drm_gem_ttm_of_gem(gobj);
diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
index c9b30dbdc14d..0b7aebaae843 100644
--- a/drivers/gpu/drm/xe/xe_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_debugfs.c
@@ -5,6 +5,7 @@
#include "xe_debugfs.h"
+#include <linux/debugfs.h>
#include <linux/string_helpers.h>
#include <drm/drm_debugfs.h>
diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
index ff7f4cf52fa9..8cf0b2625efc 100644
--- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
@@ -5,6 +5,8 @@
#include "xe_gt_debugfs.h"
+#include <linux/debugfs.h>
+
#include <drm/drm_debugfs.h>
#include <drm/drm_managed.h>
diff --git a/drivers/gpu/drm/xe/xe_uc_debugfs.c b/drivers/gpu/drm/xe/xe_uc_debugfs.c
index 0a39ec5a6e99..78eb8db73791 100644
--- a/drivers/gpu/drm/xe/xe_uc_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_uc_debugfs.c
@@ -3,6 +3,8 @@
* Copyright © 2022 Intel Corporation
*/
+#include <linux/debugfs.h>
+
#include <drm/drm_debugfs.h>
#include "xe_gt.h"
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 9cc473e5d353..561c3b96b6fd 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -30,11 +30,11 @@
#include <linux/printk.h>
#include <linux/seq_file.h>
#include <linux/device.h>
-#include <linux/debugfs.h>
#include <linux/dynamic_debug.h>
#include <drm/drm.h>
+struct debugfs_regset32;
struct drm_device;
/* Do *not* use outside of drm_print.[ch]! */
--
2.39.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-04-25 11:37 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-10 14:14 [PATCH 1/2] drm/print: drop include debugfs.h and include where needed Jani Nikula
2024-04-10 14:54 ` Andrzej Hajda
2024-04-15 13:09 ` Jani Nikula
2024-04-15 14:23 ` Maxime Ripard
2024-04-22 12:10 Jani Nikula
2024-04-22 13:28 ` Dmitry Baryshkov
2024-04-24 13:54 ` Jani Nikula
2024-04-24 18:56 ` Deucher, Alexander
2024-04-24 20:38 ` Lyude Paul
2024-04-24 20:50 ` Lucas De Marchi
2024-04-25 11:36 ` Robert Foss
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).