<div dir="auto">I should have written "v2" in the title<div dir="auto"><br></div><div dir="auto">Alexandre</div></div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Fri., Mar. 21, 2025, 21:47 Alexandre Demers, <<a href="mailto:alexandre.f.demers@gmail.com">alexandre.f.demers@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The following series is intented to remove duplicated defines, shifts and masks or<br>
to classify them where they belong. si_enums.h has been used as a garbage can<br>
for anything and everything when moving SI code from radeon to amdgpu. <br>
<br>
Where needed, the defines found under sid.h and si_enums.h were ported to DCE6,<br>
GFX6 and GMC6 defines, shifts and masks. There location was based on CIK and<br>
later.<br>
<br>
However, most of them were already available, but not used where they could be.<br>
<br>
This series is running on my PITCAIRN setup without any visible drawbacks.<br>
<br>
V2: Drop unneeded comments.<br>
Remove "ix" prefix on some defines, since they are not indexes.<br>
Make sure each patch has a description.<br>
<br>
Alexandre Demers (18):<br>
drm/amdgpu: move GFX6 defines into gfx_v6_0.c<br>
drm/amdgpu: wire up defines, shifts and masks through SI code<br>
drm/amdgpu: use proper defines, shifts and masks in DCE6 code<br>
drm/amdgpu: remove PACKET3 duplicated defines from si_enums.h<br>
drm/admgpu: move si_ih.c away from sid.h defines<br>
drm/amdgpu: use GRPH_SECONDARY_SURFACE_ADDRESS_MASK with<br>
GRPH_SECONDARY_SURFACE_ADDRESS in DCE6<br>
drm/amdgpu: move DCE6 away from sid.h and si_enums.h defines<br>
drm/amdgpu: add missing DMA defines, shifts and masks<br>
drm/amdgpu: add missing GFX6 defines<br>
drm/amdgpu: add missing SMU6 defines, shifts and masks<br>
drm/pm/legacy-dpm: move SI away from sid.h and si_enums.h<br>
drm/amdgpu: fix GFX6 variables for sid.h cleanup<br>
drm/amdgpu: move si.c away from sid.h<br>
drm/amdgpu: move si_dma.c away from sid.h and si_enums.h<br>
drm/amdgpu: huge sid.h cleanup, drop substituted defines.<br>
drm/amdgpu: keep removing sid.h dependency from si_dma.c<br>
drm/amdgpu: cleanup DCE6 a bit more<br>
drm/amdgpu: continue cleaning up sid.h and si_enums.h<br>
<br>
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 176 +-<br>
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 15 +-<br>
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +-<br>
drivers/gpu/drm/amd/amdgpu/si.c | 387 +++--<br>
drivers/gpu/drm/amd/amdgpu/si_dma.c | 116 +-<br>
drivers/gpu/drm/amd/amdgpu/si_enums.h | 234 +--<br>
drivers/gpu/drm/amd/amdgpu/si_ih.c | 17 +-<br>
drivers/gpu/drm/amd/amdgpu/sid.h | 1546 ++---------------<br>
.../include/asic_reg/dce/dce_6_0_sh_mask.h | 4 +-<br>
.../drm/amd/include/asic_reg/gca/gfx_6_0_d.h | 2 +<br>
.../drm/amd/include/asic_reg/oss/oss_1_0_d.h | 23 +-<br>
.../include/asic_reg/oss/oss_1_0_sh_mask.h | 43 +<br>
.../drm/amd/include/asic_reg/smu/smu_6_0_d.h | 44 +<br>
.../include/asic_reg/smu/smu_6_0_sh_mask.h | 190 +-<br>
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 358 ++--<br>
drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c | 42 +-<br>
16 files changed, 1001 insertions(+), 2198 deletions(-)<br>
<br>
-- <br>
2.48.1<br>
<br>
</blockquote></div>