On 6/8/26 21:47, Shahyan Soltani wrote: > Remove #include "amdgpu_video_codecs.h" from amdgpu.h and add forward > declaration > of struct amdgpu_video_codecs. > > Add #include "amdgpu_video_codecs.h" into files amdgpu_kms.c, amdgpu_virt.c, > cik.c, nv.c, si.c, soc15.c, soc21.c, soc24.c, soc_v1_0.c, and vi.c. > > Signed-off-by: Shahyan Soltani <[email protected]>
Reviewed-by: Christian König <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + > drivers/gpu/drm/amd/amdgpu/cik.c | 1 + > drivers/gpu/drm/amd/amdgpu/nv.c | 1 + > drivers/gpu/drm/amd/amdgpu/si.c | 1 + > drivers/gpu/drm/amd/amdgpu/soc15.c | 1 + > drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + > drivers/gpu/drm/amd/amdgpu/soc24.c | 1 + > drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/vi.c | 1 + > 11 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index a733ebb61300..fc1775ffa956 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_video_codecs.h" > #if defined(CONFIG_DRM_AMD_ISP) > #include "amdgpu_isp.h" > #endif > @@ -329,6 +328,7 @@ struct amdgpu_reset_control; > struct amdgpu_coredump_info; > struct amdgpu_uid; > struct amdgpu_init_level; > +struct amdgpu_video_codecs; > > enum amdgpu_cp_irq { > AMDGPU_CP_IRQ_GFX_ME0_PIPE0_EOP = 0, > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > index 24526e92f9b8..23b3034753d2 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > @@ -46,6 +46,7 @@ > #include "amdgpu_reset.h" > #include "amd_pcie.h" > #include "amdgpu_userq.h" > +#include "amdgpu_video_codecs.h" > > void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev) > { > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > index f8e58d12e39a..749de39e8e3c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > @@ -34,6 +34,7 @@ > #include "amdgpu_ras.h" > #include "amdgpu_reset.h" > #include "amdgpu_dpm.h" > +#include "amdgpu_video_codecs.h" > #include "vi.h" > #include "soc15.h" > #include "nv.h" > diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c > b/drivers/gpu/drm/amd/amdgpu/cik.c > index 29954c7d61b0..72d03a15d68b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/cik.c > +++ b/drivers/gpu/drm/amd/amdgpu/cik.c > @@ -36,6 +36,7 @@ > #include "cikd.h" > #include "atom.h" > #include "amd_pcie.h" > +#include "amdgpu_video_codecs.h" > > #include "cik.h" > #include "gmc_v7_0.h" > diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c > index 72edf5326b05..09bf861d2d17 100644 > --- a/drivers/gpu/drm/amd/amdgpu/nv.c > +++ b/drivers/gpu/drm/amd/amdgpu/nv.c > @@ -36,6 +36,7 @@ > #include "amdgpu_psp.h" > #include "atom.h" > #include "amd_pcie.h" > +#include "amdgpu_video_codecs.h" > > #include "gc/gc_10_1_0_offset.h" > #include "gc/gc_10_1_0_sh_mask.h" > diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c > index c26cb3e8bff6..e003fdfaeceb 100644 > --- a/drivers/gpu/drm/amd/amdgpu/si.c > +++ b/drivers/gpu/drm/amd/amdgpu/si.c > @@ -35,6 +35,7 @@ > #include "amdgpu_vce.h" > #include "atom.h" > #include "amd_pcie.h" > +#include "amdgpu_video_codecs.h" > > #include "si_dpm.h" > #include "sid.h" > diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c > b/drivers/gpu/drm/amd/amdgpu/soc15.c > index 49b9d81cf8ca..3dbd684b8007 100644 > --- a/drivers/gpu/drm/amd/amdgpu/soc15.c > +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c > @@ -78,6 +78,7 @@ > #include "amdgpu_ras.h" > #include "amdgpu_xgmi.h" > #include "amdgpu_init_level.h" > +#include "amdgpu_video_codecs.h" > #include <uapi/linux/kfd_ioctl.h> > > #define mmMP0_MISC_CGTT_CTRL0 > 0x01b9 > diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c > b/drivers/gpu/drm/amd/amdgpu/soc21.c > index 93c002e511c7..20dd530be3ba 100644 > --- a/drivers/gpu/drm/amd/amdgpu/soc21.c > +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c > @@ -33,6 +33,7 @@ > #include "amdgpu_ucode.h" > #include "amdgpu_psp.h" > #include "amdgpu_smu.h" > +#include "amdgpu_video_codecs.h" > #include "atom.h" > #include "amd_pcie.h" > > diff --git a/drivers/gpu/drm/amd/amdgpu/soc24.c > b/drivers/gpu/drm/amd/amdgpu/soc24.c > index 265db9331d0b..0f470aafcafd 100644 > --- a/drivers/gpu/drm/amd/amdgpu/soc24.c > +++ b/drivers/gpu/drm/amd/amdgpu/soc24.c > @@ -34,6 +34,7 @@ > #include "amdgpu_smu.h" > #include "atom.h" > #include "amd_pcie.h" > +#include "amdgpu_video_codecs.h" > > #include "gc/gc_12_0_0_offset.h" > #include "gc/gc_12_0_0_sh_mask.h" > diff --git a/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c > b/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c > index 5f05c8e68297..db26ee4854ed 100644 > --- a/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c > @@ -29,6 +29,7 @@ > #include "gfxhub_v12_1.h" > #include "sdma_v7_1.h" > #include "gfx_v12_1.h" > +#include "amdgpu_video_codecs.h" > > #include "gc/gc_12_1_0_offset.h" > #include "gc/gc_12_1_0_sh_mask.h" > diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c > index a256320b92f3..9c2c313ebc6b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vi.c > +++ b/drivers/gpu/drm/amd/amdgpu/vi.c > @@ -34,6 +34,7 @@ > #include "amdgpu_ucode.h" > #include "atom.h" > #include "amd_pcie.h" > +#include "amdgpu_video_codecs.h" > > #include "gmc/gmc_8_1_d.h" > #include "gmc/gmc_8_1_sh_mask.h"
