Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230414120344.3170942-1-trix@redhat.com>
In-Reply-To: <20230414120344.3170942-1-trix@redhat.com>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Fri, 14 Apr 2023 17:41:51 -0400
Message-ID: <CADnq5_N2j-ASAUS4Y9rmAnPyKzJ47bS4PD6y93041-dCttt8NA@mail.gmail.com>
Subject: Re: [PATCH] drm/amd/pm: change pmfw_decoded_link_width, speed
 variables to globals
To:     Tom Rix <trix@redhat.com>
Cc:     evan.quan@amd.com, alexander.deucher@amd.com,
        christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com,
        daniel@ffwll.ch, Hawking.Zhang@amd.com, kenneth.feng@amd.com,
        tim.huang@amd.com, lijo.lazar@amd.com, mario.limonciello@amd.com,
        dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Applied.  Thanks!

Alex

On Fri, Apr 14, 2023 at 8:04=E2=80=AFAM Tom Rix <trix@redhat.com> wrote:
>
> gcc with W=3D1 reports
> In file included from drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v1=
3_0.c:36:
> ./drivers/gpu/drm/amd/amdgpu/../pm/swsmu/inc/smu_v13_0.h:66:18: error:
>   =E2=80=98pmfw_decoded_link_width=E2=80=99 defined but not used [-Werror=
=3Dunused-const-variable=3D]
>    66 | static const int pmfw_decoded_link_width[7] =3D {0, 1, 2, 4, 8, 1=
2, 16};
>       |                  ^~~~~~~~~~~~~~~~~~~~~~~
> ./drivers/gpu/drm/amd/amdgpu/../pm/swsmu/inc/smu_v13_0.h:65:18: error:
>   =E2=80=98pmfw_decoded_link_speed=E2=80=99 defined but not used [-Werror=
=3Dunused-const-variable=3D]
>    65 | static const int pmfw_decoded_link_speed[5] =3D {1, 2, 3, 4, 5};
>       |                  ^~~~~~~~~~~~~~~~~~~~~~~
>
> These variables are defined and used in smu_v13_0_7_ppt.c and smu_v13_0_0=
_ppt.c.
> There should be only one definition.  So define the variables as globals
> in smu_v13_0.c
>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>  drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h   | 4 ++--
>  drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 +++
>  2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h b/drivers/gpu/d=
rm/amd/pm/swsmu/inc/smu_v13_0.h
> index 7944ce80e5c3..df3baaab0037 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
> +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
> @@ -62,8 +62,8 @@
>  #define CTF_OFFSET_HOTSPOT             5
>  #define CTF_OFFSET_MEM                 5
>
> -static const int pmfw_decoded_link_speed[5] =3D {1, 2, 3, 4, 5};
> -static const int pmfw_decoded_link_width[7] =3D {0, 1, 2, 4, 8, 12, 16};
> +extern const int pmfw_decoded_link_speed[5];
> +extern const int pmfw_decoded_link_width[7];
>
>  #define DECODE_GEN_SPEED(gen_speed_idx)                (pmfw_decoded_lin=
k_speed[gen_speed_idx])
>  #define DECODE_LANE_WIDTH(lane_width_idx)      (pmfw_decoded_link_width[=
lane_width_idx])
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu=
/drm/amd/pm/swsmu/smu13/smu_v13_0.c
> index 73175c993da9..393c6a7b9609 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
> @@ -85,6 +85,9 @@ MODULE_FIRMWARE("amdgpu/smu_13_0_10.bin");
>  static const int link_width[] =3D {0, 1, 2, 4, 8, 12, 16};
>  static const int link_speed[] =3D {25, 50, 80, 160};
>
> +const int pmfw_decoded_link_speed[5] =3D {1, 2, 3, 4, 5};
> +const int pmfw_decoded_link_width[7] =3D {0, 1, 2, 4, 8, 12, 16};
> +
>  int smu_v13_0_init_microcode(struct smu_context *smu)
>  {
>         struct amdgpu_device *adev =3D smu->adev;
> --
> 2.27.0
>