drm/print: drop include debugfs.h and include where needed
Subsystems (11)
PATCH v2 1/2 drm/print: drop include debugfs.h and include where needed
Surprisingly many places depend on debugfs.h to be included via drm_print.h. Fix them.
v2: Also fix ivpu and vmwgfx
---
--- drivers/accel/ivpu/ivpu_debugfs.c | 2 ++ 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 +++-- drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 ++ include/drm/drm_print.h | 2 +- 22 files changed, 34 insertions(+), 8 deletions(-)
drivers/accel/ivpu/ivpu_debugfs.c +2 -0
@@ -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>
drivers/gpu/drm/bridge/panel.c +2 -0
@@ -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>
drivers/gpu/drm/drm_print.c +3 -3
@@ -23,13 +23,13 @@* Rob Clark <[email protected]> */ -#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>
drivers/gpu/drm/i915/display/intel_dmc.c +1 -0
@@ -22,6 +22,7 @@* */ +#include <linux/debugfs.h> #include <linux/firmware.h> #include "i915_drv.h"
drivers/gpu/drm/nouveau/dispnv50/crc.c +2 -0
@@ -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>
drivers/gpu/drm/radeon/r100.c +1 -0
@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/firmware.h> #include <linux/module.h> #include <linux/pci.h>
drivers/gpu/drm/radeon/r300.c +1 -0
@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/pci.h> #include <linux/seq_file.h> #include <linux/slab.h>
drivers/gpu/drm/radeon/r420.c +1 -0
@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/pci.h> #include <linux/seq_file.h> #include <linux/slab.h>
drivers/gpu/drm/radeon/r600.c +2 -1
@@ -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>
drivers/gpu/drm/radeon/radeon_fence.c +1 -0
@@ -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>
drivers/gpu/drm/radeon/radeon_gem.c +1 -0
@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/iosys-map.h> #include <linux/pci.h>
drivers/gpu/drm/radeon/radeon_ib.c +2 -0
@@ -27,6 +27,8 @@* Christian König */ +#include <linux/debugfs.h> +#include <drm/drm_file.h> #include "radeon.h"
drivers/gpu/drm/radeon/radeon_pm.c +1 -0
@@ -21,6 +21,7 @@* Alex Deucher <[email protected]> */ +#include <linux/debugfs.h> #include <linux/hwmon-sysfs.h> #include <linux/hwmon.h> #include <linux/pci.h>
drivers/gpu/drm/radeon/radeon_ring.c +2 -0
@@ -27,6 +27,8 @@* Christian König */ +#include <linux/debugfs.h> +#include <drm/drm_device.h> #include <drm/drm_file.h>
drivers/gpu/drm/radeon/radeon_ttm.c +1 -0
@@ -30,6 +30,7 @@* Dave Airlie */ +#include <linux/debugfs.h> #include <linux/dma-mapping.h> #include <linux/pagemap.h> #include <linux/pci.h>
drivers/gpu/drm/radeon/rs400.c +1 -0
@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/slab.h>
drivers/gpu/drm/radeon/rv515.c +1 -0
@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/slab.h>
drivers/gpu/drm/ttm/ttm_device.c +1 -0
@@ -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>
drivers/gpu/drm/ttm/ttm_resource.c +2 -1
@@ -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>
drivers/gpu/drm/ttm/ttm_tt.c +3 -2
@@ -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>
drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +2 -0
@@ -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);
include/drm/drm_print.h +1 -1
@@ -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]! */
Signature · 1 line
2.39.2
PATCH v2 2/2 drm/print: drop include seq_file.h
Never include where a forward declaration will suffice.
--- include/drm/drm_print.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/drm_print.h +1 -1
@@ -28,7 +28,6 @@#include <linux/compiler.h> #include <linux/printk.h> -#include <linux/seq_file.h> #include <linux/device.h> #include <linux/dynamic_debug.h>
@@ -36,6 +35,7 @@struct debugfs_regset32 ;struct drm_device ; +struct seq_file ;/* Do *not* use outside of drm_print.[ch]! */ extern unsigned long __drm_debug;
Signature · 1 line
2.39.2
Robert Foss
maintainerHey Jani,
Thanks for doing this cleanup.
Quoted 369 lines · Jani Nikula
Surprisingly many places depend on
debugfs.hto be included viadrm_print.h. Fix them.v2: Also fix ivpu and vmwgfx
Reviewed-by Andrzej Hajda <[email protected]>Acked-by Maxime Ripard <[email protected]>Signed-off-by Jani Nikula <[email protected]>---
Cc Jacek Lawrynowicz <[email protected]>Cc Stanislaw Gruszka <[email protected]>Cc Oded Gabbay <[email protected]>Cc Andrzej Hajda <[email protected]>Cc Neil Armstrong <[email protected]>Cc Robert Foss <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Jonas Karlman <[email protected]>Cc Jernej Skrabec <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Karol Herbst <[email protected]>Cc Lyude Paul <[email protected]>Cc Danilo Krummrich <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc "Pan, Xinhui" <[email protected]>Cc Huang Rui <[email protected]>Cc Zack Rusin <[email protected]>Cc Broadcom internal kernel review list <[email protected]>--- drivers/accel/ivpu/ivpu_debugfs.c | 2 ++ 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 +++-- drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 ++ include/drm/drm_print.h | 2 +- 22 files changed, 34 insertions(+), 8 deletions(-)drivers/accel/ivpu/ivpu_debugfs.c +2
-0@@ -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> drivers/gpu/drm/bridge/panel.c +2
-0@@ -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> drivers/gpu/drm/drm_print.c +3
-3@@ -23,13 +23,13 @@* Rob Clark <[email protected]> */ -#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> drivers/gpu/drm/i915/display/intel_dmc.c +1
-0@@ -22,6 +22,7 @@* */ +#include <linux/debugfs.h> #include <linux/firmware.h> #include "i915_drv.h" drivers/gpu/drm/nouveau/dispnv50/crc.c +2
-0@@ -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> drivers/gpu/drm/radeon/r100.c +1
-0@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/firmware.h> #include <linux/module.h> #include <linux/pci.h> drivers/gpu/drm/radeon/r300.c +1
-0@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/pci.h> #include <linux/seq_file.h> #include <linux/slab.h> drivers/gpu/drm/radeon/r420.c +1
-0@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/pci.h> #include <linux/seq_file.h> #include <linux/slab.h> drivers/gpu/drm/radeon/r600.c +2
-1@@ -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> drivers/gpu/drm/radeon/radeon_fence.c +1
-0@@ -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> drivers/gpu/drm/radeon/radeon_gem.c +1
-0@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/iosys-map.h> #include <linux/pci.h> drivers/gpu/drm/radeon/radeon_ib.c +2
-0@@ -27,6 +27,8 @@* Christian König */ +#include <linux/debugfs.h> +#include <drm/drm_file.h> #include "radeon.h" drivers/gpu/drm/radeon/radeon_pm.c +1
-0@@ -21,6 +21,7 @@* Alex Deucher <[email protected]> */ +#include <linux/debugfs.h> #include <linux/hwmon-sysfs.h> #include <linux/hwmon.h> #include <linux/pci.h> drivers/gpu/drm/radeon/radeon_ring.c +2
-0@@ -27,6 +27,8 @@* Christian König */ +#include <linux/debugfs.h> +#include <drm/drm_device.h> #include <drm/drm_file.h> drivers/gpu/drm/radeon/radeon_ttm.c +1
-0@@ -30,6 +30,7 @@* Dave Airlie */ +#include <linux/debugfs.h> #include <linux/dma-mapping.h> #include <linux/pagemap.h> #include <linux/pci.h> drivers/gpu/drm/radeon/rs400.c +1
-0@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/slab.h> drivers/gpu/drm/radeon/rv515.c +1
-0@@ -26,6 +26,7 @@* Jerome Glisse */ +#include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/slab.h> drivers/gpu/drm/ttm/ttm_device.c +1
-0@@ -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> drivers/gpu/drm/ttm/ttm_resource.c +2
-1@@ -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> drivers/gpu/drm/ttm/ttm_tt.c +3
-2@@ -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> drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +2
-0@@ -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);include/drm/drm_print.h +1
-2@@ -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]! */ --
Quoted 2 lines
2.39.2
I'm seeing build errors for drivers/gpu/drm/bridge/ite-it6505.c, is this expected?
Quoted 2 lines · Robert Foss
I'm seeing build errors for
drivers/gpu/drm/bridge/ite-it6505.c, is this expected?
No, but it's possible my configs didn't catch all configs. :(
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel
Quoted 5 lines · Jani Nikula
Quoted 2 lines · Robert Foss
I'm seeing build errors for
drivers/gpu/drm/bridge/ite-it6505.c, is this expected?No, but it's possible my configs didn't catch all configs. :(
Okay, enabled a bunch more arm/arm64 stuff, and hit some more issues. v3 at [1].
BR,
Jani.
[1] https://lore.kernel.org/r/[email protected]
Signature · 1 line
Jani Nikula, Intel