[PATCH] drm/amdgpu: move gfx9_cs_data definition

[Alex Deucher]

On Thu, May 25, 2023 at 4:35 PM Tom Rix <trix at redhat.com> wrote:
>
> gcc with W=1 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:
>   ‘gfx9_cs_data’ defined but not used [-Werror=unused-const-variable=]
>   939 | static const struct cs_section_def gfx9_cs_data[] = {
>       |                                    ^~~~~~~~~~~~
>
> gfx9_cs_data is only used in gfx_v9_0.c, so move its definition there.
>
> Signed-off-by: Tom Rix <trix at 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/drm/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_defs[] =
>      {gfx9_SECT_CONTEXT_def_8, 0x0000a2f5, 155 },
>      { 0, 0, 0 }
>  };
> -static const struct cs_section_def gfx9_cs_data[] = {
> -    { 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[] = {
> +    { 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
>