[PATCH 00/18] Properly wire defines, shifts and masks in SI and cleanup

[Alex Deucher]

On Fri, Mar 21, 2025 at 9:58 PM Alexandre Demers
<alexandre.f.demers at gmail.com> wrote:
>
> The following series is intented to remove duplicated defines, shifts and masks or
> to classify them where they belong. si_enums.h has been used as a garbage can
> for anything and everything when moving SI code from radeon to amdgpu.
>
> Where needed, the defines found under sid.h and si_enums.h were ported to DCE6,
> GFX6 and GMC6 defines, shifts and masks. There location was based on CIK and
> later.
>
> However, most of them were already available, but not used where they could be.
>
> This series is running on my PITCAIRN setup without any visible drawbacks.

Applied 1-9, 12, 14, 16-18 with some minor fixes.  See my comments on
patch 10.  The remaining patches depend on patch 10.

Thanks,

Alex

>
> V2: Drop unneeded comments.
> Remove "ix" prefix on some defines, since they are not indexes.
> Make sure each patch has a description.
>
> Alexandre Demers (18):
>   drm/amdgpu: move GFX6 defines into gfx_v6_0.c
>   drm/amdgpu: wire up defines, shifts and masks through SI code
>   drm/amdgpu: use proper defines, shifts and masks in DCE6 code
>   drm/amdgpu: remove PACKET3 duplicated defines from si_enums.h
>   drm/admgpu: move si_ih.c away from sid.h defines
>   drm/amdgpu: use GRPH_SECONDARY_SURFACE_ADDRESS_MASK with
>     GRPH_SECONDARY_SURFACE_ADDRESS in DCE6
>   drm/amdgpu: move DCE6 away from sid.h and si_enums.h defines
>   drm/amdgpu: add missing DMA defines, shifts and masks
>   drm/amdgpu: add missing GFX6 defines
>   drm/amdgpu: add missing SMU6 defines, shifts and masks
>   drm/pm/legacy-dpm: move SI away from sid.h and si_enums.h
>   drm/amdgpu: fix GFX6 variables for sid.h cleanup
>   drm/amdgpu: move si.c away from sid.h
>   drm/amdgpu: move si_dma.c away from sid.h and si_enums.h
>   drm/amdgpu: huge sid.h cleanup, drop substituted defines.
>   drm/amdgpu: keep removing sid.h dependency from si_dma.c
>   drm/amdgpu: cleanup DCE6 a bit more
>   drm/amdgpu: continue cleaning up sid.h and si_enums.h
>
>  drivers/gpu/drm/amd/amdgpu/dce_v6_0.c         |  176 +-
>  drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c         |   15 +-
>  drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c         |    2 +-
>  drivers/gpu/drm/amd/amdgpu/si.c               |  387 +++--
>  drivers/gpu/drm/amd/amdgpu/si_dma.c           |  116 +-
>  drivers/gpu/drm/amd/amdgpu/si_enums.h         |  234 +--
>  drivers/gpu/drm/amd/amdgpu/si_ih.c            |   17 +-
>  drivers/gpu/drm/amd/amdgpu/sid.h              | 1546 ++---------------
>  .../include/asic_reg/dce/dce_6_0_sh_mask.h    |    4 +-
>  .../drm/amd/include/asic_reg/gca/gfx_6_0_d.h  |    2 +
>  .../drm/amd/include/asic_reg/oss/oss_1_0_d.h  |   23 +-
>  .../include/asic_reg/oss/oss_1_0_sh_mask.h    |   43 +
>  .../drm/amd/include/asic_reg/smu/smu_6_0_d.h  |   44 +
>  .../include/asic_reg/smu/smu_6_0_sh_mask.h    |  190 +-
>  drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c    |  358 ++--
>  drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c    |   42 +-
>  16 files changed, 1001 insertions(+), 2198 deletions(-)
>
> --
> 2.48.1
>