drm/print: drop include debugfs.h and include where needed
Subsystems (18)
PATCH 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.
v3: Also fix armada, ite-it6505, imagination, msm, sti, vc4, and xe
v2: Also fix ivpu and vmwgfx
---
--- 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(-)
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/armada/armada_debugfs.c +1 -0
@@ -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>
drivers/gpu/drm/bridge/ite-it6505.c +1 -0
@@ -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>
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/imagination/pvr_fw_trace.c +1 -0
@@ -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>
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +2 -0
@@ -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"
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/sti/sti_drv.c +1 -0
@@ -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>
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/vc4/vc4_drv.h +1 -0
@@ -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>
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);
drivers/gpu/drm/xe/xe_debugfs.c +1 -0
@@ -5,6 +5,7 @@#include "xe_debugfs.h" +#include <linux/debugfs.h> #include <linux/string_helpers.h> #include <drm/drm_debugfs.h>
drivers/gpu/drm/xe/xe_gt_debugfs.c +2 -0
@@ -5,6 +5,8 @@#include "xe_gt_debugfs.h" +#include <linux/debugfs.h> +#include <drm/drm_debugfs.h> #include <drm/drm_managed.h>
drivers/gpu/drm/xe/xe_uc_debugfs.c +2 -0
@@ -3,6 +3,8 @@* Copyright © 2022 Intel Corporation */ +#include <linux/debugfs.h> +#include <drm/drm_debugfs.h> #include "xe_gt.h"
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 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
Re: [PATCH 2/2] drm/print: drop include seq_file.h
Quoted 23 lines · Jani Nikula
Never include where a forward declaration will suffice.
Reviewed-by Andrzej Hajda <[email protected]>Acked-by Maxime Ripard <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- include/drm/drm_print.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/drm/drm_print.h +0
-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>
include/drm/drm_print.h line 41
Quoted 7 lines
include/drm/drm_print.h +1
-0@@ -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;
Looks like this broke komeda and omapdrm on arm:
/home/notro/develop/dim-linux/src/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c:
In function ‘komeda_pipeline_dump_register’:/home/notro/develop/dim-linux/src/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c:366:9:
error: implicit declaration of function ‘seq_printf’; did you mean ‘drm_printf’? [-Werror=implicit-function-declaration]
366 | seq_printf(sf, "\n======== Pipeline-%d ==========\n",
pipe->id);
| ^~~~~~~~~~
| drm_printf/home/notro/develop/dim-linux/src/drivers/gpu/drm/omapdrm/omap_fb.c: In function ‘omap_framebuffer_describe’:/home/notro/develop/dim-linux/src/drivers/gpu/drm/omapdrm/omap_fb.c:325:9:
error: implicit declaration of function ‘seq_printf’; did you mean ‘drm_printf’? [-Werror=implicit-function-declaration]
325 | seq_printf(m, "fb: %dx%d@%4.4s\n", fb->width, fb->height,
| ^~~~~~~~~~
| drm_printfNoralf.
Re: [PATCH 2/2] drm/print: drop include seq_file.h
Quoted 49 lines · Noralf Trønnes
Quoted 23 lines · Jani Nikula
Never include where a forward declaration will suffice.
Reviewed-by Andrzej Hajda <[email protected]>Acked-by Maxime Ripard <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- include/drm/drm_print.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/drm/drm_print.h +0
-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> include/drm/drm_print.h line 41
Quoted 7 lines
include/drm/drm_print.h +1
-0@@ -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;Looks like this broke komeda and omapdrm on arm:
/home/notro/develop/dim-linux/src/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c:
In function ‘komeda_pipeline_dump_register’:/home/notro/develop/dim-linux/src/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c:366:9:
error: implicit declaration of function ‘seq_printf’; did you mean ‘drm_printf’? [-Werror=implicit-function-declaration]
366 | seq_printf(sf, "\n======== Pipeline-%d ==========\n",pipe->id); | ^~~~~~~~~~ | drm_printf
/home/notro/develop/dim-linux/src/drivers/gpu/drm/omapdrm/omap_fb.c: In function ‘omap_framebuffer_describe’:/home/notro/develop/dim-linux/src/drivers/gpu/drm/omapdrm/omap_fb.c:325:9:
error: implicit declaration of function ‘seq_printf’; did you mean ‘drm_printf’? [-Werror=implicit-function-declaration]
Quoted 5 lines
325 | seq_printf(m, "fb: %dx%d@%4.4s\n", fb->width, fb->height, | ^~~~~~~~~~ | drm_printfNoralf.
Sad trombone. I built on arm and arm64, with omap and komeda enabled, but apparently still missed some options. Sorry. :(
Dave fixed these when pulling drm-misc-next, so a backmerge from drm-next to drm-misc-next should handle it.
Sorry again,
Jani.
Signature · 1 line
Jani Nikula, Intel
Re: [PATCH 2/2] drm/print: drop include seq_file.h
Quoted 56 lines · Jani Nikula
Quoted 49 lines · Noralf Trønnes
Quoted 23 lines · Jani Nikula
Never include where a forward declaration will suffice.
Reviewed-by Andrzej Hajda <[email protected]>Acked-by Maxime Ripard <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- include/drm/drm_print.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/drm/drm_print.h +0
-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> include/drm/drm_print.h line 41
Quoted 7 lines
include/drm/drm_print.h +1
-0@@ -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;Looks like this broke komeda and omapdrm on arm:
/home/notro/develop/dim-linux/src/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c:
In function ‘komeda_pipeline_dump_register’:/home/notro/develop/dim-linux/src/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c:366:9:
error: implicit declaration of function ‘seq_printf’; did you mean ‘drm_printf’? [-Werror=implicit-function-declaration]
366 | seq_printf(sf, "\n======== Pipeline-%d ==========\n",pipe->id); | ^~~~~~~~~~ | drm_printf
/home/notro/develop/dim-linux/src/drivers/gpu/drm/omapdrm/omap_fb.c: In function ‘omap_framebuffer_describe’:/home/notro/develop/dim-linux/src/drivers/gpu/drm/omapdrm/omap_fb.c:325:9:
error: implicit declaration of function ‘seq_printf’; did you mean ‘drm_printf’? [-Werror=implicit-function-declaration]Quoted 5 lines
325 | seq_printf(m, "fb: %dx%d@%4.4s\n", fb->width, fb->height, | ^~~~~~~~~~ | drm_printfNoralf.
Quoted 9 lines
Sad trombone. I built on arm and arm64, with omap and komeda enabled, but apparently still missed some options. Sorry. :(
Dave fixed these when pulling drm-misc-next, so a backmerge from drm-next to drm-misc-next should handle it.
Sorry again,
Jani.
No problem, I was just suprised that the build bots hadn't caught this, but just minutes after I sent this it was detected. I kind of assumed that in this day and age there was a bot that checked drm-tip after each push/sync, but not there yet I guess.
I used the defconfigs from drm-tip:rerere-cache which caught this.
Noralf.
Re: [PATCH 2/2] drm/print: drop include seq_file.h
Quoted 1 line · Noralf Trønnes
I used the defconfigs from drm-tip:rerere-cache which caught this.
Odd. This is what my configs are based on too. I can only assume a 'make olddefconfig' down the line has defaulted something to n at some point.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel
Quoted 59 lines · Jani Nikula
Surprisingly many places depend on
debugfs.hto be included viadrm_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 <[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 Russell King <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[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 Jani Nikula <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Frank Binns <[email protected]>Cc Matt Coster <[email protected]>Cc Rob Clark <[email protected]>Cc Abhinav Kumar <[email protected]>Cc Dmitry Baryshkov <[email protected]>Cc Sean Paul <[email protected]>Cc Marijn Suijten <[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 Alain Volmat <[email protected]>Cc Huang Rui <[email protected]>Cc Zack Rusin <[email protected]>Cc Broadcom internal kernel review list <[email protected]>Cc Lucas De Marchi <[email protected]>Cc "Thomas Hellström" <[email protected]>
Quoted 9 lines
--- 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 ++
Quoted 24 lines
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(-)
Signature · 2 lines
With best wishes Dmitry
Quoted 59 lines · Jani Nikula
Surprisingly many places depend on
debugfs.hto be included viadrm_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 <[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 Russell King <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[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 Jani Nikula <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Frank Binns <[email protected]>Cc Matt Coster <[email protected]>Cc Rob Clark <[email protected]>Cc Abhinav Kumar <[email protected]>Cc Dmitry Baryshkov <[email protected]>Cc Sean Paul <[email protected]>Cc Marijn Suijten <[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 Alain Volmat <[email protected]>Cc Huang Rui <[email protected]>Cc Zack Rusin <[email protected]>Cc Broadcom internal kernel review list <[email protected]>Cc Lucas De Marchi <[email protected]>Cc "Thomas Hellström" <[email protected]>
Quoted 8 lines
--- 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 +
Cheers,
Matt
Quoted 435 lines
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(-)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/armada/armada_debugfs.c +1
-0@@ -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> drivers/gpu/drm/bridge/ite-it6505.c +1
-0@@ -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> 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/imagination/pvr_fw_trace.c +1
-0@@ -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> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +2
-0@@ -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" 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/sti/sti_drv.c +1
-0@@ -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> 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/vc4/vc4_drv.h +1
-0@@ -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> 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);drivers/gpu/drm/xe/xe_debugfs.c +1
-0@@ -5,6 +5,7 @@#include "xe_debugfs.h" +#include <linux/debugfs.h> #include <linux/string_helpers.h> #include <drm/drm_debugfs.h> drivers/gpu/drm/xe/xe_gt_debugfs.c +2
-0@@ -5,6 +5,8 @@#include "xe_gt_debugfs.h" +#include <linux/debugfs.h> +#include <drm/drm_debugfs.h> #include <drm/drm_managed.h> drivers/gpu/drm/xe/xe_uc_debugfs.c +2
-0@@ -3,6 +3,8 @@* Copyright © 2022 Intel Corporation */ +#include <linux/debugfs.h> +#include <drm/drm_debugfs.h> #include "xe_gt.h" 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]! */
Quoted 11 lines · Jani Nikula
Surprisingly many places depend on
debugfs.hto be included viadrm_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 <[email protected]>Acked-by Maxime Ripard <[email protected]>Signed-off-by Jani Nikula <[email protected]>
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.
Quoted 491 lines
---
Cc Jacek Lawrynowicz <[email protected]>Cc Stanislaw Gruszka <[email protected]>Cc Oded Gabbay <[email protected]>Cc Russell King <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[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 Jani Nikula <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Frank Binns <[email protected]>Cc Matt Coster <[email protected]>Cc Rob Clark <[email protected]>Cc Abhinav Kumar <[email protected]>Cc Dmitry Baryshkov <[email protected]>Cc Sean Paul <[email protected]>Cc Marijn Suijten <[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 Alain Volmat <[email protected]>Cc Huang Rui <[email protected]>Cc Zack Rusin <[email protected]>Cc Broadcom internal kernel review list <[email protected]>Cc Lucas De Marchi <[email protected]>Cc "Thomas Hellström" <[email protected]>--- 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(-)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/armada/armada_debugfs.c +1
-0@@ -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> drivers/gpu/drm/bridge/ite-it6505.c +1
-0@@ -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> 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/imagination/pvr_fw_trace.c +1
-0@@ -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> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +2
-0@@ -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" 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/sti/sti_drv.c +1
-0@@ -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> 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/vc4/vc4_drv.h +1
-0@@ -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> 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);drivers/gpu/drm/xe/xe_debugfs.c +1
-0@@ -5,6 +5,7 @@#include "xe_debugfs.h" +#include <linux/debugfs.h> #include <linux/string_helpers.h> #include <drm/drm_debugfs.h> drivers/gpu/drm/xe/xe_gt_debugfs.c +2
-0@@ -5,6 +5,8 @@#include "xe_gt_debugfs.h" +#include <linux/debugfs.h> +#include <drm/drm_debugfs.h> #include <drm/drm_managed.h> drivers/gpu/drm/xe/xe_uc_debugfs.c +2
-0@@ -3,6 +3,8 @@* Copyright © 2022 Intel Corporation */ +#include <linux/debugfs.h> +#include <drm/drm_debugfs.h> #include "xe_gt.h" 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
Jani Nikula, Intel
[Public]
Quoted 47 lines
-----Original Message-----
From: Jani Nikula <[email protected]>
Sent: Wednesday, April 24, 2024 9:55 AM
To: [email protected]
Cc: Andrzej Hajda <[email protected]>; Maxime Ripard <[email protected]>; Jacek Lawrynowicz <[email protected]>; Stanislaw Gruszka <[email protected]>; Oded Gabbay <[email protected]>; Russell King <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Neil Armstrong <[email protected]>; Robert Foss <[email protected]>; Laurent Pinchart <[email protected]>; Jonas Karlman <[email protected]>; Jernej Skrabec <[email protected]>; Maarten Lankhorst <[email protected]>; Thomas Zimmermann <[email protected]>; Rodrigo Vivi <[email protected]>; Joonas Lahtinen <[email protected]>; Tvrtko Ursulin <[email protected]>; Frank Binns <[email protected]>; Matt Coster <[email protected]>; Rob Clark <[email protected]>; Abhinav Kumar <[email protected]>; Dmitry Baryshkov <[email protected]>; Sean Paul <[email protected]>; Marijn Suijten <[email protected]>; Karol Herbst <[email protected]>; Lyude Paul <[email protected]>; Danilo Krummrich <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; Alain Volmat <[email protected]>; Huang, Ray <[email protected]>; Zack Rusin <[email protected]>; Broadcom internal kernel review list <[email protected]>; Lucas De Marchi <[email protected]>; Thomas Hellström <[email protected]>; [email protected]; intel- [email protected]; [email protected]; [email protected]; [email protected]; amd- [email protected]
Subject: Re: [PATCH 1/2] drm/print: drop includedebugfs.hand include where neededQuoted 11 lines · Jani Nikula
Surprisingly many places depend on
debugfs.hto be included viadrm_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 <[email protected]>Acked-by Maxime Ripard <[email protected]>Link:
Quoted 8 lines
https://patchwork.freedesktop.org/patch/msgid/20240410141434.157908
-1-Quoted 2 lines
Signed-off-by Jani Nikula <[email protected]>While the changes all over the place are small, mostly just adding the
debugfs.hinclude, please consider acking. I've sent this a few times already.
For radeon:
Quoted 529 lines
Otherwise, I'll merge this by the end of the week, acks or not.
Thanks,
Jani.Quoted 418 lines
---
Cc: Jacek Lawrynowicz <[email protected]>
Cc: Stanislaw Gruszka <[email protected]>
Cc: Oded Gabbay <[email protected]>
Cc: Russell King <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[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: Jani Nikula <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: Joonas Lahtinen <[email protected]>
Cc: Tvrtko Ursulin <[email protected]>
Cc: Frank Binns <[email protected]>
Cc: Matt Coster <[email protected]>
Cc: Rob Clark <[email protected]>
Cc: Abhinav Kumar <[email protected]>
Cc: Dmitry Baryshkov <[email protected]>
Cc: Sean Paul <[email protected]>
Cc: Marijn Suijten <[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: Alain Volmat <[email protected]>
Cc: Huang Rui <[email protected]>
Cc: Zack Rusin <[email protected]>
Cc: Broadcom internal kernel review list <[email protected]>
Cc: Lucas De Marchi <[email protected]>
Cc: "Thomas Hellström" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]--- 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(-)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/armada/armada_debugfs.c +1
-0@@ -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> drivers/gpu/drm/bridge/ite-it6505.c +1
-0@@ -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> (quoted diff) +0
-0
b/drivers/gpu/drm/bridge/panel.cindex7f41525f7a6e..32506524d9a2100644drivers/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/imagination/pvr_fw_trace.c +1
-0@@ -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> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +2
-0@@ -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" 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> (quoted diff) +0
-0
b/drivers/gpu/drm/radeon/r100.cindex86b8b770af19..0b1e19345f43100644drivers/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> (quoted diff) +0
-0
b/drivers/gpu/drm/radeon/r300.cindex25201b9a5aae..1620f534f55f100644drivers/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> (quoted diff) +0
-0
b/drivers/gpu/drm/radeon/r420.cindexeae8a6389f5e..a979662eaa73100644drivers/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> (quoted diff) +0
-0
b/drivers/gpu/drm/radeon/r600.cindexb5e97d95a19f..087d41e370fd100644drivers/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> (quoted diff) +0
-0
b/drivers/gpu/drm/radeon/rs400.cindexd7f552d441ab..d4d1501e6576100644drivers/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> (quoted diff) +0
-0
b/drivers/gpu/drm/radeon/rv515.cindex79709d26d983..bbc6ccabf788100644drivers/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> (quoted diff) +0
-0
b/drivers/gpu/drm/sti/sti_drv.cindex4bab93c4fefd..1799c12babf5100644drivers/gpu/drm/sti/sti_drv.c +1
-0@@ -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> 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> (quoted diff) +0
-0Quoted 1 line
b/drivers/gpu/drm/ttm/ttm_tt.cindex578a7c37f00b..474fe7aad2a0100644
Quoted 89 lines
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> (quoted diff) +0
-0
b/drivers/gpu/drm/vc4/vc4_drv.hindexab61e96e7e14..08e29fa82563100644drivers/gpu/drm/vc4/vc4_drv.h +1
-0@@ -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> 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); diff --git
a/drivers/gpu/drm/xe/xe_debugfs.cb/drivers/gpu/drm/xe/xe_debugfs.cindexc9b30dbdc14d..0b7aebaae843100644drivers/gpu/drm/xe/xe_debugfs.c +1
-0@@ -5,6 +5,7 @@#include "xe_debugfs.h" +#include <linux/debugfs.h> #include <linux/string_helpers.h> #include <drm/drm_debugfs.h> drivers/gpu/drm/xe/xe_gt_debugfs.c +2
-0@@ -5,6 +5,8 @@#include "xe_gt_debugfs.h" +#include <linux/debugfs.h> +#include <drm/drm_debugfs.h> #include <drm/drm_managed.h> drivers/gpu/drm/xe/xe_uc_debugfs.c +2
-0@@ -3,6 +3,8 @@* Copyright © 2022 Intel Corporation */ +#include <linux/debugfs.h> +#include <drm/drm_debugfs.h> #include "xe_gt.h" include/drm/drm_print.h index renamed from include/drm/drm_print.h +0
-0
9cc473e5d353..561c3b96b6fd100644include/drm/drm_print.h +0
-0@@ -30,11 +30,11 @@#include <linux/printk.h> #include <linux/seq_file.h> include/drm/drm_print.h line 40
Quoted 10 lines
include/drm/drm_print.h +1
-1#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
For the nouveau bits:
Quoted 535 lines · Jani Nikula
Surprisingly many places depend on
debugfs.hto be included viadrm_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 <[email protected]>Acked-by Maxime Ripard <[email protected]>Link:
https://patchwork.freedesktop.org/patch/msgid/[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: Russell King <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[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: Jani Nikula <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: Joonas Lahtinen <[email protected]>
Cc: Tvrtko Ursulin <[email protected]>
Cc: Frank Binns <[email protected]>
Cc: Matt Coster <[email protected]>
Cc: Rob Clark <[email protected]>
Cc: Abhinav Kumar <[email protected]>
Cc: Dmitry Baryshkov <[email protected]>
Cc: Sean Paul <[email protected]>
Cc: Marijn Suijten <[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: Alain Volmat <[email protected]>
Cc: Huang Rui <[email protected]>
Cc: Zack Rusin <[email protected]>
Cc: Broadcom internal kernel review list <[email protected]>
Cc: Lucas De Marchi <[email protected]>
Cc: "Thomas Hellström" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
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(-)drivers/accel/ivpu/ivpu_debugfs.c +0
-0@@ -3,6 +3,8 @@* Copyright (C) 2020-2023 Intel Corporation */ drivers/accel/ivpu/ivpu_debugfs.c +2
-0+#include <linux/debugfs.h> +#include <
drm/drm_debugfs.h>
#include <drm/drm_file.h>
#include <drm/drm_print.h>drivers/gpu/drm/armada/armada_debugfs.c +0
-0@@ -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>drivers/gpu/drm/bridge/ite-it6505.c +1
-0@@ -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>drivers/gpu/drm/bridge/panel.c +0
-0@@ -4,6 +4,8 @@* Copyright (C) 2017 Broadcom */ drivers/gpu/drm/bridge/panel.c +2
-0+#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 +0
-0@@ -23,13 +23,13 @@* Rob Clark <[email protected]> */ drivers/gpu/drm/drm_print.c +2
-2-#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>drivers/gpu/drm/drm_print.c +1
-1-#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 +0
-0@@ -22,6 +22,7 @@* */
+#include <linux/debugfs.h>
#include <linux/firmware.h>
#include "i915_drv.h"drivers/gpu/drm/imagination/pvr_fw_trace.c +0
-0@@ -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>drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +0
-0@@ -2,6 +2,8 @@ /* Copyright (c) 2015-2018, The Linux Foundation. All rightsreserved.
*/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +2
-0+#include <linux/debugfs.h> +#include "
dpu_hwio.h"
#include "dpu_hw_catalog.h"
#include "dpu_hw_lm.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 +0
-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 +0
-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 +0
-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 +0
-0@@ -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 +0
-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 +0
-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 +0
-0@@ -27,6 +27,8 @@* Christian König */ drivers/gpu/drm/radeon/radeon_ib.c +2
-0+#include <linux/debugfs.h> +#include <
drm/drm_file.h>
#include "radeon.h"drivers/gpu/drm/radeon/radeon_pm.c +0
-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 +0
-0@@ -27,6 +27,8 @@* Christian König */ drivers/gpu/drm/radeon/radeon_ring.c +2
-0+#include <linux/debugfs.h> +#include <
drm/drm_device.h>
#include <drm/drm_file.h>drivers/gpu/drm/radeon/radeon_ttm.c +0
-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 +0
-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 +0
-0@@ -26,6 +26,7 @@* Jerome Glisse */
+#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/slab.h>drivers/gpu/drm/sti/sti_drv.c +0
-0@@ -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>drivers/gpu/drm/ttm/ttm_device.c +0
-0@@ -27,6 +27,7 @@
#definepr_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 +0
-0@@ -22,8 +22,9 @@* Authors: Christian König */ drivers/gpu/drm/ttm/ttm_resource.c +1
-1-#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 +0
-0@@ -32,10 +32,11 @@ #define pr_fmt(fmt) "[TTM] " fmt
#include <linux/cc_platform.h>drivers/gpu/drm/ttm/ttm_tt.c +1
-2-#include <linux/sched.h> -#include <linux/shmem_fs.h> +#include <linux/debugfs.h> #include <
linux/file.h>
#include <linux/module.h>drivers/gpu/drm/ttm/ttm_tt.c +2
-0+#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/vc4/vc4_drv.h +0
-0@@ -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>drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +0
-0@@ -30,6 +30,8 @@ #include "drm/drm_prime.h" #include "drm/drm_gem_ttm_helper.h"drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +2
-0+#include <linux/debugfs.h> +static void
vmw_gem_object_free(struct drm_gem_object *gobj){
structttm_buffer_object*bo =drm_gem_ttm_of_gem(gobj);drivers/gpu/drm/xe/xe_debugfs.c +0
-0@@ -5,6 +5,7 @@
#include "xe_debugfs.h"
+#include <linux/debugfs.h>
#include <linux/string_helpers.h>
#include <drm/drm_debugfs.h>drivers/gpu/drm/xe/xe_gt_debugfs.c +0
-0@@ -5,6 +5,8 @@
#include "xe_gt_debugfs.h"drivers/gpu/drm/xe/xe_gt_debugfs.c +2
-0+#include <linux/debugfs.h> +#include <
drm/drm_debugfs.h>
#include <drm/drm_managed.h>drivers/gpu/drm/xe/xe_uc_debugfs.c +0
-0@@ -3,6 +3,8 @@* Copyright © 2022 Intel Corporation */ drivers/gpu/drm/xe/xe_uc_debugfs.c +2
-0+#include <linux/debugfs.h> +#include <
drm/drm_debugfs.h>
#include "xe_gt.h"include/drm/drm_print.h +0
-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>
+structdebugfs_regset32;
structdrm_device;
/* Do *not* use outside of drm_print.[ch]! */
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Quoted 3 lines · Jani Nikula
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 ++
thanks
Lucas De Marchi
Quoted 504 lines · Jani Nikula
Surprisingly many places depend on
debugfs.hto be included viadrm_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 <[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 Russell King <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[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 Jani Nikula <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Frank Binns <[email protected]>Cc Matt Coster <[email protected]>Cc Rob Clark <[email protected]>Cc Abhinav Kumar <[email protected]>Cc Dmitry Baryshkov <[email protected]>Cc Sean Paul <[email protected]>Cc Marijn Suijten <[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 Alain Volmat <[email protected]>Cc Huang Rui <[email protected]>Cc Zack Rusin <[email protected]>Cc Broadcom internal kernel review list <[email protected]>Cc Lucas De Marchi <[email protected]>Cc "Thomas Hellström" <[email protected]>--- 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(-)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/armada/armada_debugfs.c +1
-0@@ -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> drivers/gpu/drm/bridge/ite-it6505.c +1
-0@@ -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> 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/imagination/pvr_fw_trace.c +1
-0@@ -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> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +2
-0@@ -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" 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/sti/sti_drv.c +1
-0@@ -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> 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/vc4/vc4_drv.h +1
-0@@ -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> 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);drivers/gpu/drm/xe/xe_debugfs.c +1
-0@@ -5,6 +5,7 @@#include "xe_debugfs.h" +#include <linux/debugfs.h> #include <linux/string_helpers.h> #include <drm/drm_debugfs.h> drivers/gpu/drm/xe/xe_gt_debugfs.c +2
-0@@ -5,6 +5,8 @@#include "xe_gt_debugfs.h" +#include <linux/debugfs.h> +#include <drm/drm_debugfs.h> #include <drm/drm_managed.h> drivers/gpu/drm/xe/xe_uc_debugfs.c +2
-0@@ -3,6 +3,8 @@* Copyright © 2022 Intel Corporation */ +#include <linux/debugfs.h> +#include <drm/drm_debugfs.h> #include "xe_gt.h" 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 3 lines
2.39.2