Re: [PATCH 1/2] drm/print: drop include debugfs.h and include where needed

Andrzej Hajda <andrzej.hajda@xxxxxxxxx> · Wed, 10 Apr 2024 16:54:11 +0200

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@xxxxxxxxx>

---

Reviewed-by: Andrzej Hajda <andrzej.hajda@xxxxxxxxx>

Regards
Andrzej


Cc: Andrzej Hajda <andrzej.hajda@xxxxxxxxx>
Cc: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
Cc: Robert Foss <rfoss@xxxxxxxxxx>
Cc: Laurent Pinchart <Laurent.pinchart@xxxxxxxxxxxxxxxx>
Cc: Jonas Karlman <jonas@xxxxxxxxx>
Cc: Jernej Skrabec <jernej.skrabec@xxxxxxxxx>
Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
Cc: Maxime Ripard <mripard@xxxxxxxxxx>
Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
Cc: David Airlie <airlied@xxxxxxxxx>
Cc: Daniel Vetter <daniel@xxxxxxxx>
Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
Cc: Karol Herbst <kherbst@xxxxxxxxxx>
Cc: Lyude Paul <lyude@xxxxxxxxxx>
Cc: Danilo Krummrich <dakr@xxxxxxxxxx>
Cc: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: "Christian König" <christian.koenig@xxxxxxx>
Cc: "Pan, Xinhui" <Xinhui.Pan@xxxxxxx>
Cc: Huang Rui <ray.huang@xxxxxxx>
Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
Cc: intel-xe@xxxxxxxxxxxxxxxxxxxxx
Cc: nouveau@xxxxxxxxxxxxxxxxxxxxx
Cc: amd-gfx@xxxxxxxxxxxxxxxxxxxxx
---
  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@xxxxxxxxx>
   */
  
-#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@xxxxxxxxx>
   */
  
+#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]! */







