For the nouveau bits: Reviewed-by: Lyude Paul <ly...@redhat.com>
On Mon, 2024-04-22 at 15:10 +0300, Jani Nikula wrote: > Surprisingly many places depend on debugfs.h to be included via > drm_print.h. Fix them. > > v3: Also fix armada, ite-it6505, imagination, msm, sti, vc4, and xe > > v2: Also fix ivpu and vmwgfx > > Reviewed-by: Andrzej Hajda <andrzej.ha...@intel.com> > Acked-by: Maxime Ripard <mrip...@kernel.org> > Link: > https://patchwork.freedesktop.org/patch/msgid/20240410141434.157908-1-jani.nik...@intel.com > Signed-off-by: Jani Nikula <jani.nik...@intel.com> > > --- > > Cc: Jacek Lawrynowicz <jacek.lawrynow...@linux.intel.com> > Cc: Stanislaw Gruszka <stanislaw.grus...@linux.intel.com> > Cc: Oded Gabbay <ogab...@kernel.org> > Cc: Russell King <li...@armlinux.org.uk> > Cc: David Airlie <airl...@gmail.com> > Cc: Daniel Vetter <dan...@ffwll.ch> > Cc: Andrzej Hajda <andrzej.ha...@intel.com> > Cc: Neil Armstrong <neil.armstr...@linaro.org> > Cc: Robert Foss <rf...@kernel.org> > Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com> > Cc: Jonas Karlman <jo...@kwiboo.se> > Cc: Jernej Skrabec <jernej.skra...@gmail.com> > Cc: Maarten Lankhorst <maarten.lankho...@linux.intel.com> > Cc: Maxime Ripard <mrip...@kernel.org> > Cc: Thomas Zimmermann <tzimmerm...@suse.de> > Cc: Jani Nikula <jani.nik...@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.v...@intel.com> > Cc: Joonas Lahtinen <joonas.lahti...@linux.intel.com> > Cc: Tvrtko Ursulin <tursu...@ursulin.net> > Cc: Frank Binns <frank.bi...@imgtec.com> > Cc: Matt Coster <matt.cos...@imgtec.com> > Cc: Rob Clark <robdcl...@gmail.com> > Cc: Abhinav Kumar <quic_abhin...@quicinc.com> > Cc: Dmitry Baryshkov <dmitry.barysh...@linaro.org> > Cc: Sean Paul <s...@poorly.run> > Cc: Marijn Suijten <marijn.suij...@somainline.org> > Cc: Karol Herbst <kher...@redhat.com> > Cc: Lyude Paul <ly...@redhat.com> > Cc: Danilo Krummrich <d...@redhat.com> > Cc: Alex Deucher <alexander.deuc...@amd.com> > Cc: "Christian König" <christian.koe...@amd.com> > Cc: "Pan, Xinhui" <xinhui....@amd.com> > Cc: Alain Volmat <alain.vol...@foss.st.com> > Cc: Huang Rui <ray.hu...@amd.com> > Cc: Zack Rusin <zack.ru...@broadcom.com> > Cc: Broadcom internal kernel review list > <bcm-kernel-feedback-l...@broadcom.com> > Cc: Lucas De Marchi <lucas.demar...@intel.com> > Cc: "Thomas Hellström" <thomas.hellst...@linux.intel.com> > Cc: dri-de...@lists.freedesktop.org > Cc: intel-...@lists.freedesktop.org > Cc: intel...@lists.freedesktop.org > Cc: linux-arm-...@vger.kernel.org > Cc: freedreno@lists.freedesktop.org > Cc: nouv...@lists.freedesktop.org > Cc: amd-...@lists.freedesktop.org > --- > drivers/accel/ivpu/ivpu_debugfs.c | 2 ++ > drivers/gpu/drm/armada/armada_debugfs.c | 1 + > drivers/gpu/drm/bridge/ite-it6505.c | 1 + > drivers/gpu/drm/bridge/panel.c | 2 ++ > drivers/gpu/drm/drm_print.c | 6 +++--- > drivers/gpu/drm/i915/display/intel_dmc.c | 1 + > drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 + > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 ++ > drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 ++ > drivers/gpu/drm/radeon/r100.c | 1 + > drivers/gpu/drm/radeon/r300.c | 1 + > drivers/gpu/drm/radeon/r420.c | 1 + > drivers/gpu/drm/radeon/r600.c | 3 ++- > drivers/gpu/drm/radeon/radeon_fence.c | 1 + > drivers/gpu/drm/radeon/radeon_gem.c | 1 + > drivers/gpu/drm/radeon/radeon_ib.c | 2 ++ > drivers/gpu/drm/radeon/radeon_pm.c | 1 + > drivers/gpu/drm/radeon/radeon_ring.c | 2 ++ > drivers/gpu/drm/radeon/radeon_ttm.c | 1 + > drivers/gpu/drm/radeon/rs400.c | 1 + > drivers/gpu/drm/radeon/rv515.c | 1 + > drivers/gpu/drm/sti/sti_drv.c | 1 + > drivers/gpu/drm/ttm/ttm_device.c | 1 + > drivers/gpu/drm/ttm/ttm_resource.c | 3 ++- > drivers/gpu/drm/ttm/ttm_tt.c | 5 +++-- > drivers/gpu/drm/vc4/vc4_drv.h | 1 + > drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 ++ > drivers/gpu/drm/xe/xe_debugfs.c | 1 + > drivers/gpu/drm/xe/xe_gt_debugfs.c | 2 ++ > drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 ++ > include/drm/drm_print.h | 2 +- > 31 files changed, 46 insertions(+), 8 deletions(-) > > diff --git a/drivers/accel/ivpu/ivpu_debugfs.c > b/drivers/accel/ivpu/ivpu_debugfs.c > index d09d29775b3f..e07e447d08d1 100644 > --- a/drivers/accel/ivpu/ivpu_debugfs.c > +++ b/drivers/accel/ivpu/ivpu_debugfs.c > @@ -3,6 +3,8 @@ > * Copyright (C) 2020-2023 Intel Corporation > */ > > +#include <linux/debugfs.h> > + > #include <drm/drm_debugfs.h> > #include <drm/drm_file.h> > #include <drm/drm_print.h> > diff --git a/drivers/gpu/drm/armada/armada_debugfs.c > b/drivers/gpu/drm/armada/armada_debugfs.c > index 29f4b52e3c8d..a763349dd89f 100644 > --- a/drivers/gpu/drm/armada/armada_debugfs.c > +++ b/drivers/gpu/drm/armada/armada_debugfs.c > @@ -5,6 +5,7 @@ > */ > > #include <linux/ctype.h> > +#include <linux/debugfs.h> > #include <linux/module.h> > #include <linux/seq_file.h> > #include <linux/uaccess.h> > diff --git a/drivers/gpu/drm/bridge/ite-it6505.c > b/drivers/gpu/drm/bridge/ite-it6505.c > index 27334173e911..3f68c82888c2 100644 > --- a/drivers/gpu/drm/bridge/ite-it6505.c > +++ b/drivers/gpu/drm/bridge/ite-it6505.c > @@ -3,6 +3,7 @@ > * Copyright (c) 2020, The Linux Foundation. All rights reserved. > */ > #include <linux/bits.h> > +#include <linux/debugfs.h> > #include <linux/delay.h> > #include <linux/device.h> > #include <linux/err.h> > diff --git a/drivers/gpu/drm/bridge/panel.c > b/drivers/gpu/drm/bridge/panel.c > index 7f41525f7a6e..32506524d9a2 100644 > --- a/drivers/gpu/drm/bridge/panel.c > +++ b/drivers/gpu/drm/bridge/panel.c > @@ -4,6 +4,8 @@ > * Copyright (C) 2017 Broadcom > */ > > +#include <linux/debugfs.h> > + > #include <drm/drm_atomic_helper.h> > #include <drm/drm_bridge.h> > #include <drm/drm_connector.h> > diff --git a/drivers/gpu/drm/drm_print.c > b/drivers/gpu/drm/drm_print.c > index 699b7dbffd7b..cf2efb44722c 100644 > --- a/drivers/gpu/drm/drm_print.c > +++ b/drivers/gpu/drm/drm_print.c > @@ -23,13 +23,13 @@ > * Rob Clark <robdcl...@gmail.com> > */ > > -#include <linux/stdarg.h> > - > +#include <linux/debugfs.h> > +#include <linux/dynamic_debug.h> > #include <linux/io.h> > #include <linux/moduleparam.h> > #include <linux/seq_file.h> > #include <linux/slab.h> > -#include <linux/dynamic_debug.h> > +#include <linux/stdarg.h> > > #include <drm/drm.h> > #include <drm/drm_drv.h> > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c > b/drivers/gpu/drm/i915/display/intel_dmc.c > index 3697a02b51b6..09346afd1f0e 100644 > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > @@ -22,6 +22,7 @@ > * > */ > > +#include <linux/debugfs.h> > #include <linux/firmware.h> > > #include "i915_drv.h" > diff --git a/drivers/gpu/drm/imagination/pvr_fw_trace.c > b/drivers/gpu/drm/imagination/pvr_fw_trace.c > index 31199e45b72e..73707daa4e52 100644 > --- a/drivers/gpu/drm/imagination/pvr_fw_trace.c > +++ b/drivers/gpu/drm/imagination/pvr_fw_trace.c > @@ -12,6 +12,7 @@ > > #include <linux/build_bug.h> > #include <linux/dcache.h> > +#include <linux/debugfs.h> > #include <linux/sysfs.h> > #include <linux/types.h> > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > index 0bf8a83e8df3..8586f2761782 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > @@ -2,6 +2,8 @@ > /* Copyright (c) 2015-2018, The Linux Foundation. All rights > reserved. > */ > > +#include <linux/debugfs.h> > + > #include "dpu_hwio.h" > #include "dpu_hw_catalog.h" > #include "dpu_hw_lm.h" > diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c > b/drivers/gpu/drm/nouveau/dispnv50/crc.c > index 9c942fbd836d..5936b6b3b15d 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/crc.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c > @@ -1,5 +1,7 @@ > // SPDX-License-Identifier: MIT > +#include <linux/debugfs.h> > #include <linux/string.h> > + > #include <drm/drm_crtc.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_vblank.h> > diff --git a/drivers/gpu/drm/radeon/r100.c > b/drivers/gpu/drm/radeon/r100.c > index 86b8b770af19..0b1e19345f43 100644 > --- a/drivers/gpu/drm/radeon/r100.c > +++ b/drivers/gpu/drm/radeon/r100.c > @@ -26,6 +26,7 @@ > * Jerome Glisse > */ > > +#include <linux/debugfs.h> > #include <linux/firmware.h> > #include <linux/module.h> > #include <linux/pci.h> > diff --git a/drivers/gpu/drm/radeon/r300.c > b/drivers/gpu/drm/radeon/r300.c > index 25201b9a5aae..1620f534f55f 100644 > --- a/drivers/gpu/drm/radeon/r300.c > +++ b/drivers/gpu/drm/radeon/r300.c > @@ -26,6 +26,7 @@ > * Jerome Glisse > */ > > +#include <linux/debugfs.h> > #include <linux/pci.h> > #include <linux/seq_file.h> > #include <linux/slab.h> > diff --git a/drivers/gpu/drm/radeon/r420.c > b/drivers/gpu/drm/radeon/r420.c > index eae8a6389f5e..a979662eaa73 100644 > --- a/drivers/gpu/drm/radeon/r420.c > +++ b/drivers/gpu/drm/radeon/r420.c > @@ -26,6 +26,7 @@ > * Jerome Glisse > */ > > +#include <linux/debugfs.h> > #include <linux/pci.h> > #include <linux/seq_file.h> > #include <linux/slab.h> > diff --git a/drivers/gpu/drm/radeon/r600.c > b/drivers/gpu/drm/radeon/r600.c > index b5e97d95a19f..087d41e370fd 100644 > --- a/drivers/gpu/drm/radeon/r600.c > +++ b/drivers/gpu/drm/radeon/r600.c > @@ -26,11 +26,12 @@ > * Jerome Glisse > */ > > +#include <linux/debugfs.h> > #include <linux/firmware.h> > #include <linux/module.h> > #include <linux/pci.h> > -#include <linux/slab.h> > #include <linux/seq_file.h> > +#include <linux/slab.h> > > #include <drm/drm_device.h> > #include <drm/drm_vblank.h> > diff --git a/drivers/gpu/drm/radeon/radeon_fence.c > b/drivers/gpu/drm/radeon/radeon_fence.c > index 9ebe4a0b9a6c..4fb780d96f32 100644 > --- a/drivers/gpu/drm/radeon/radeon_fence.c > +++ b/drivers/gpu/drm/radeon/radeon_fence.c > @@ -30,6 +30,7 @@ > */ > > #include <linux/atomic.h> > +#include <linux/debugfs.h> > #include <linux/firmware.h> > #include <linux/kref.h> > #include <linux/sched/signal.h> > diff --git a/drivers/gpu/drm/radeon/radeon_gem.c > b/drivers/gpu/drm/radeon/radeon_gem.c > index 3fec3acdaf28..2ef201a072f1 100644 > --- a/drivers/gpu/drm/radeon/radeon_gem.c > +++ b/drivers/gpu/drm/radeon/radeon_gem.c > @@ -26,6 +26,7 @@ > * Jerome Glisse > */ > > +#include <linux/debugfs.h> > #include <linux/iosys-map.h> > #include <linux/pci.h> > > diff --git a/drivers/gpu/drm/radeon/radeon_ib.c > b/drivers/gpu/drm/radeon/radeon_ib.c > index fb9ecf5dbe2b..63d914f3414d 100644 > --- a/drivers/gpu/drm/radeon/radeon_ib.c > +++ b/drivers/gpu/drm/radeon/radeon_ib.c > @@ -27,6 +27,8 @@ > * Christian König > */ > > +#include <linux/debugfs.h> > + > #include <drm/drm_file.h> > > #include "radeon.h" > diff --git a/drivers/gpu/drm/radeon/radeon_pm.c > b/drivers/gpu/drm/radeon/radeon_pm.c > index 4482c8c5f5ce..2d9d9f46f243 100644 > --- a/drivers/gpu/drm/radeon/radeon_pm.c > +++ b/drivers/gpu/drm/radeon/radeon_pm.c > @@ -21,6 +21,7 @@ > * Alex Deucher <alexdeuc...@gmail.com> > */ > > +#include <linux/debugfs.h> > #include <linux/hwmon-sysfs.h> > #include <linux/hwmon.h> > #include <linux/pci.h> > diff --git a/drivers/gpu/drm/radeon/radeon_ring.c > b/drivers/gpu/drm/radeon/radeon_ring.c > index 38048593bb4a..8d1d458286a8 100644 > --- a/drivers/gpu/drm/radeon/radeon_ring.c > +++ b/drivers/gpu/drm/radeon/radeon_ring.c > @@ -27,6 +27,8 @@ > * Christian König > */ > > +#include <linux/debugfs.h> > + > #include <drm/drm_device.h> > #include <drm/drm_file.h> > > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c > b/drivers/gpu/drm/radeon/radeon_ttm.c > index 2078b0000e22..5c65b6dfb99a 100644 > --- a/drivers/gpu/drm/radeon/radeon_ttm.c > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c > @@ -30,6 +30,7 @@ > * Dave Airlie > */ > > +#include <linux/debugfs.h> > #include <linux/dma-mapping.h> > #include <linux/pagemap.h> > #include <linux/pci.h> > diff --git a/drivers/gpu/drm/radeon/rs400.c > b/drivers/gpu/drm/radeon/rs400.c > index d7f552d441ab..d4d1501e6576 100644 > --- a/drivers/gpu/drm/radeon/rs400.c > +++ b/drivers/gpu/drm/radeon/rs400.c > @@ -26,6 +26,7 @@ > * Jerome Glisse > */ > > +#include <linux/debugfs.h> > #include <linux/seq_file.h> > #include <linux/slab.h> > > diff --git a/drivers/gpu/drm/radeon/rv515.c > b/drivers/gpu/drm/radeon/rv515.c > index 79709d26d983..bbc6ccabf788 100644 > --- a/drivers/gpu/drm/radeon/rv515.c > +++ b/drivers/gpu/drm/radeon/rv515.c > @@ -26,6 +26,7 @@ > * Jerome Glisse > */ > > +#include <linux/debugfs.h> > #include <linux/seq_file.h> > #include <linux/slab.h> > > diff --git a/drivers/gpu/drm/sti/sti_drv.c > b/drivers/gpu/drm/sti/sti_drv.c > index 4bab93c4fefd..1799c12babf5 100644 > --- a/drivers/gpu/drm/sti/sti_drv.c > +++ b/drivers/gpu/drm/sti/sti_drv.c > @@ -5,6 +5,7 @@ > */ > > #include <linux/component.h> > +#include <linux/debugfs.h> > #include <linux/dma-mapping.h> > #include <linux/kernel.h> > #include <linux/module.h> > diff --git a/drivers/gpu/drm/ttm/ttm_device.c > b/drivers/gpu/drm/ttm/ttm_device.c > index 76027960054f..434cf0258000 100644 > --- a/drivers/gpu/drm/ttm/ttm_device.c > +++ b/drivers/gpu/drm/ttm/ttm_device.c > @@ -27,6 +27,7 @@ > > #define pr_fmt(fmt) "[TTM DEVICE] " fmt > > +#include <linux/debugfs.h> > #include <linux/mm.h> > > #include <drm/ttm/ttm_bo.h> > diff --git a/drivers/gpu/drm/ttm/ttm_resource.c > b/drivers/gpu/drm/ttm/ttm_resource.c > index be8d286513f9..4a66b851b67d 100644 > --- a/drivers/gpu/drm/ttm/ttm_resource.c > +++ b/drivers/gpu/drm/ttm/ttm_resource.c > @@ -22,8 +22,9 @@ > * Authors: Christian König > */ > > -#include <linux/iosys-map.h> > +#include <linux/debugfs.h> > #include <linux/io-mapping.h> > +#include <linux/iosys-map.h> > #include <linux/scatterlist.h> > > #include <drm/ttm/ttm_bo.h> > diff --git a/drivers/gpu/drm/ttm/ttm_tt.c > b/drivers/gpu/drm/ttm/ttm_tt.c > index 578a7c37f00b..474fe7aad2a0 100644 > --- a/drivers/gpu/drm/ttm/ttm_tt.c > +++ b/drivers/gpu/drm/ttm/ttm_tt.c > @@ -32,10 +32,11 @@ > #define pr_fmt(fmt) "[TTM] " fmt > > #include <linux/cc_platform.h> > -#include <linux/sched.h> > -#include <linux/shmem_fs.h> > +#include <linux/debugfs.h> > #include <linux/file.h> > #include <linux/module.h> > +#include <linux/sched.h> > +#include <linux/shmem_fs.h> > #include <drm/drm_cache.h> > #include <drm/drm_device.h> > #include <drm/drm_util.h> > diff --git a/drivers/gpu/drm/vc4/vc4_drv.h > b/drivers/gpu/drm/vc4/vc4_drv.h > index ab61e96e7e14..08e29fa82563 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.h > +++ b/drivers/gpu/drm/vc4/vc4_drv.h > @@ -5,6 +5,7 @@ > #ifndef _VC4_DRV_H_ > #define _VC4_DRV_H_ > > +#include <linux/debugfs.h> > #include <linux/delay.h> > #include <linux/of.h> > #include <linux/refcount.h> > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c > b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c > index 2132a8ad8c0c..07185c108218 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c > @@ -30,6 +30,8 @@ > #include "drm/drm_prime.h" > #include "drm/drm_gem_ttm_helper.h" > > +#include <linux/debugfs.h> > + > static void vmw_gem_object_free(struct drm_gem_object *gobj) > { > struct ttm_buffer_object *bo = drm_gem_ttm_of_gem(gobj); > diff --git a/drivers/gpu/drm/xe/xe_debugfs.c > b/drivers/gpu/drm/xe/xe_debugfs.c > index c9b30dbdc14d..0b7aebaae843 100644 > --- a/drivers/gpu/drm/xe/xe_debugfs.c > +++ b/drivers/gpu/drm/xe/xe_debugfs.c > @@ -5,6 +5,7 @@ > > #include "xe_debugfs.h" > > +#include <linux/debugfs.h> > #include <linux/string_helpers.h> > > #include <drm/drm_debugfs.h> > diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c > b/drivers/gpu/drm/xe/xe_gt_debugfs.c > index ff7f4cf52fa9..8cf0b2625efc 100644 > --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c > +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c > @@ -5,6 +5,8 @@ > > #include "xe_gt_debugfs.h" > > +#include <linux/debugfs.h> > + > #include <drm/drm_debugfs.h> > #include <drm/drm_managed.h> > > diff --git a/drivers/gpu/drm/xe/xe_uc_debugfs.c > b/drivers/gpu/drm/xe/xe_uc_debugfs.c > index 0a39ec5a6e99..78eb8db73791 100644 > --- a/drivers/gpu/drm/xe/xe_uc_debugfs.c > +++ b/drivers/gpu/drm/xe/xe_uc_debugfs.c > @@ -3,6 +3,8 @@ > * Copyright © 2022 Intel Corporation > */ > > +#include <linux/debugfs.h> > + > #include <drm/drm_debugfs.h> > > #include "xe_gt.h" > diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h > index 9cc473e5d353..561c3b96b6fd 100644 > --- a/include/drm/drm_print.h > +++ b/include/drm/drm_print.h > @@ -30,11 +30,11 @@ > #include <linux/printk.h> > #include <linux/seq_file.h> > #include <linux/device.h> > -#include <linux/debugfs.h> > #include <linux/dynamic_debug.h> > > #include <drm/drm.h> > > +struct debugfs_regset32; > struct drm_device; > > /* Do *not* use outside of drm_print.[ch]! */ -- Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
