[PATCH v2 0/2] Uniformize defines between DCE6, DCE8 and DCE10

[Alexandre Demers]

Ok, so wiring up sid.h in dce_v6_0.c brought a lot of redefinitions.
Fixing them is not the problem, but it spreads out a bit over the two
files.

I'm having an issue with the following:
In si_enums.h, we have :
#define TAHITI_GB_ADDR_CONFIG_GOLDEN        0x12011003
#define VERDE_GB_ADDR_CONFIG_GOLDEN         0x02010002
#define HAINAN_GB_ADDR_CONFIG_GOLDEN        0x02011003

However, under sid.h, we have:
#define TAHITI_GB_ADDR_CONFIG_GOLDEN 0x12011003
#define VERDE_GB_ADDR_CONFIG_GOLDEN 0x12010002
#define HAINAN_GB_ADDR_CONFIG_GOLDEN 0x02010001

The values under sid.h are exactly the same under both radeon and
amdgpu, so I would be inclined to think they are the good ones.
However, gfx_v6_0.c uses the si_enums.h definitions.

Alex, what do you think of it?

On Sat, Mar 1, 2025 at 4:35 PM Alexandre Demers
<alexandre.f.demers at gmail.com> wrote:
>
> On Fri, Feb 28, 2025 at 9:31 PM Alexandre Demers
> <alexandre.f.demers at gmail.com> wrote:
> >
> > 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.
> >
> > Alexandre Demers (2):
> >   drm/amdgpu: add or move defines for DCE6 in sid.h
> >   drm/amdgpu: add defines for pin_offsets in DCE8
> >
> >  drivers/gpu/drm/amd/amdgpu/cikd.h     |  9 ++++
> >  drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 63 ++++++++++++++-------------
> >  drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 14 +++---
> >  drivers/gpu/drm/amd/amdgpu/si_enums.h |  7 ---
> >  drivers/gpu/drm/amd/amdgpu/sid.h      | 29 +++++++++---
> >  5 files changed, 71 insertions(+), 51 deletions(-)
> >
> > --
> > 2.48.1
> >
>
> Please, don't consider this series. Adding sid.h throws out a lot of
> redefinition. This needs to be
> fixed first. I'll send a v3 once done.
>
> Alexandre