On 6/8/26 21:47, Shahyan Soltani wrote: > Remove #include "amdgpu_init_level.h" from amdgpu.h and add forward > declaration > of struct amdgpu_init_level. > > Add #include "amdgpu_init_level.h" into files aldebaran.c, amdgpu_device.c, > amdgpu_gmc.c, amdgpu_reset.c, gmc_v9_0.c, sienna_cichlid.c, smu_v13_0_10.c, > soc15.c, amdgpu_pm.c, and smu_v11_0.c. > > Signed-off-by: Shahyan Soltani <[email protected]>
When amdgpu_init_level.h is renamed to amdgpu_device.h the patch is Reviewed-by: Christian König <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/aldebaran.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 1 + > drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 1 + > drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 1 + > drivers/gpu/drm/amd/amdgpu/soc15.c | 1 + > drivers/gpu/drm/amd/pm/amdgpu_pm.c | 1 + > drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 1 + > 11 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/aldebaran.c > b/drivers/gpu/drm/amd/amdgpu/aldebaran.c > index a7bc65099755..197876021b73 100644 > --- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c > +++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c > @@ -30,6 +30,7 @@ > #include "amdgpu_ras.h" > #include "amdgpu_psp.h" > #include "amdgpu_xgmi.h" > +#include "amdgpu_init_level.h" > > static bool aldebaran_is_mode2_default(struct amdgpu_reset_control > *reset_ctl) > { > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 06e61d66dcf3..a733ebb61300 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -116,7 +116,6 @@ > #include "amdgpu_ip.h" > #include "amdgpu_acpi.h" > #include "amdgpu_mqd.h" > -#include "amdgpu_init_level.h" > #include "amdgpu_video_codecs.h" > #if defined(CONFIG_DRM_AMD_ISP) > #include "amdgpu_isp.h" > @@ -329,6 +328,7 @@ struct amdgpu_reset_context; > struct amdgpu_reset_control; > struct amdgpu_coredump_info; > struct amdgpu_uid; > +struct amdgpu_init_level; > > enum amdgpu_cp_irq { > AMDGPU_CP_IRQ_GFX_ME0_PIPE0_EOP = 0, > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 20b67897d7ff..e7e60dba1e4d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -79,6 +79,7 @@ > #include "amdgpu_virt.h" > #include "amdgpu_dev_coredump.h" > #include "amdgpu_uid.h" > +#include "amdgpu_init_level.h" > > #include <linux/suspend.h> > #include <drm/task_barrier.h> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c > index 13bec8461cde..e55fa66f7daa 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c > @@ -35,6 +35,7 @@ > #include "amdgpu_reset.h" > #include "amdgpu_xgmi.h" > #include "amdgpu_atomfirmware.h" > +#include "amdgpu_init_level.h" > > #include <drm/drm_drv.h> > #include <drm/ttm/ttm_tt.h> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c > index da77e0ef129b..78121e698151 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c > @@ -25,6 +25,7 @@ > #include "aldebaran.h" > #include "sienna_cichlid.h" > #include "smu_v13_0_10.h" > +#include "amdgpu_init_level.h" > > static int amdgpu_reset_xgmi_reset_on_init_suspend(struct amdgpu_device > *adev) > { > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > index ced0f3941863..8b0aaa912a8f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > @@ -64,6 +64,7 @@ > > #include "amdgpu_ras.h" > #include "amdgpu_xgmi.h" > +#include "amdgpu_init_level.h" > > /* add these here since we already include dce12 headers and these are for > DCN */ > #define mmHUBP0_DCSURF_PRI_VIEWPORT_DIMENSION > 0x055d > diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c > b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c > index 2594467bdd87..940092d8bd1c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c > +++ b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c > @@ -30,6 +30,7 @@ > #include "amdgpu_ras.h" > #include "amdgpu_psp.h" > #include "amdgpu_xgmi.h" > +#include "amdgpu_init_level.h" > > static bool sienna_cichlid_is_mode2_default(struct amdgpu_reset_control > *reset_ctl) > { > diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c > b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c > index 70569ea906bc..93bc343fdfeb 100644 > --- a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c > +++ b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c > @@ -28,6 +28,7 @@ > #include "amdgpu_ring.h" > #include "amdgpu_ras.h" > #include "amdgpu_psp.h" > +#include "amdgpu_init_level.h" > > static bool smu_v13_0_10_is_mode2_default(struct amdgpu_reset_control > *reset_ctl) > { > diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c > b/drivers/gpu/drm/amd/amdgpu/soc15.c > index 87b398dd0769..49b9d81cf8ca 100644 > --- a/drivers/gpu/drm/amd/amdgpu/soc15.c > +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c > @@ -77,6 +77,7 @@ > #include "mxgpu_ai.h" > #include "amdgpu_ras.h" > #include "amdgpu_xgmi.h" > +#include "amdgpu_init_level.h" > #include <uapi/linux/kfd_ioctl.h> > > #define mmMP0_MISC_CGTT_CTRL0 > 0x01b9 > diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c > b/drivers/gpu/drm/amd/pm/amdgpu_pm.c > index 0c58d23013f4..2b138c85cf60 100644 > --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c > +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c > @@ -27,6 +27,7 @@ > #include "amdgpu_drv.h" > #include "amdgpu_pm.h" > #include "amdgpu_dpm.h" > +#include "amdgpu_init_level.h" > #include "atom.h" > #include <linux/pci.h> > #include <linux/hwmon.h> > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > index 98e7109bbc95..0ca961177c7c 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c > @@ -37,6 +37,7 @@ > #include "soc15_common.h" > #include "atom.h" > #include "amdgpu_ras.h" > +#include "amdgpu_init_level.h" > #include "smu_cmn.h" > > #include "asic_reg/thm/thm_11_0_2_offset.h"
