Keep a uniform way of where and how variables are defined between DCE6, DCE8 and DCE10. It is easier to understand the code, their similarities and their modifications. Since sid.h is being wired up in dce_v6_0.c, duplicated defines need to be cleaned up in sid.h and si_enums.h. V4: * Reorder patches so each one compiles properly. * Remove drm-amdgpu-add-defines-for-pin_offsets-in-DCE8.patch since it was already approved and applied. A bigger round of cleanup is coming to remove more of the duplicated and unused defines found in sid.h and si_enums.h and continue the uniformization. Alexandre Demers (3): drm/amdgpu: fix warning and errors caused by duplicated defines in sid.h drm/amdgpu: move and fix X_GB_ADDR_CONFIG_GOLDEN values drm/amdgpu: add or move defines for DCE6 in sid.h drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 73 ++--- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 15 +- drivers/gpu/drm/amd/amdgpu/si.c | 68 ++--- drivers/gpu/drm/amd/amdgpu/si_enums.h | 12 - drivers/gpu/drm/amd/amdgpu/sid.h | 369 ++------------------------ 5 files changed, 111 insertions(+), 426 deletions(-) -- 2.48.1