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: <20230525203531.3233040-1-trix@redhat.com>
In-Reply-To: <20230525203531.3233040-1-trix@redhat.com>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Thu, 25 May 2023 16:42:09 -0400
Message-ID: <CADnq5_MNr3RsXi65AdYxkZc8EUYpJBNm-oLhenzcLzRKmN+gLg@mail.gmail.com>
Subject: Re: [PATCH] drm/amdgpu: move gfx9_cs_data definition
To:     Tom Rix <trix@redhat.com>
Cc:     alexander.deucher@amd.com, christian.koenig@amd.com,
        Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch,
        Hawking.Zhang@amd.com, le.ma@amd.com, jesse.zhang@amd.com,
        Jiadong.Zhu@amd.com, mario.limonciello@amd.com, Likun.Gao@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

On Thu, May 25, 2023 at 4:35=E2=80=AFPM Tom Rix <trix@redhat.com> wrote:
>
> gcc with W=3D1 reports
> In file included from drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c:32:
> drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h:939:36: error:
>   =E2=80=98gfx9_cs_data=E2=80=99 defined but not used [-Werror=3Dunused-c=
onst-variable=3D]
>   939 | static const struct cs_section_def gfx9_cs_data[] =3D {
>       |                                    ^~~~~~~~~~~~
>
> gfx9_cs_data is only used in gfx_v9_0.c, so move its definition there.
>
> Signed-off-by: Tom Rix <trix@redhat.com>

Already fixed with:
https://patchwork.freedesktop.org/patch/539234/
which will show up in my tree momentarily.

Alex


> ---
>  drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h | 4 ----
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c        | 5 +++++
>  2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h b/drivers/gpu/d=
rm/amd/amdgpu/clearstate_gfx9.h
> index 567a904804bc..6de4778789ed 100644
> --- a/drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h
> +++ b/drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h
> @@ -936,7 +936,3 @@ static const struct cs_extent_def gfx9_SECT_CONTEXT_d=
efs[] =3D
>      {gfx9_SECT_CONTEXT_def_8, 0x0000a2f5, 155 },
>      { 0, 0, 0 }
>  };
> -static const struct cs_section_def gfx9_cs_data[] =3D {
> -    { gfx9_SECT_CONTEXT_defs, SECT_CONTEXT },
> -    { 0, SECT_NONE }
> -};
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/=
amdgpu/gfx_v9_0.c
> index 8bf95a6b0767..c97a68a39d93 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -56,6 +56,11 @@
>  #include "asic_reg/pwr/pwr_10_0_sh_mask.h"
>  #include "asic_reg/gc/gc_9_0_default.h"
>
> +static const struct cs_section_def gfx9_cs_data[] =3D {
> +    { gfx9_SECT_CONTEXT_defs, SECT_CONTEXT },
> +    { 0, SECT_NONE }
> +};
> +
>  #define GFX9_NUM_GFX_RINGS     1
>  #define GFX9_NUM_SW_GFX_RINGS  2
>  #define GFX9_MEC_HPD_SIZE 4096
> --
> 2.27.0
>