[PATCH] drm/amd/pm: Allocate dummy table only if needed

[Alex Deucher]

On Thu, Jan 19, 2023 at 8:16 AM Lijo Lazar <lijo.lazar at amd.com> wrote:
>
> Only Navi1x requires dummy read workaround. Allocate the table in VRAM
> only for Navi1x.
>
> Signed-off-by: Lijo Lazar <lijo.lazar at amd.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c       | 5 ++---
>  drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 6 ++++++
>  2 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> index ec52830dde24..612f62529575 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> @@ -904,9 +904,8 @@ static int smu_alloc_dummy_read_table(struct smu_context *smu)
>         struct amdgpu_device *adev = smu->adev;
>         int ret = 0;
>
> -       dummy_read_1_table->size = 0x40000;
> -       dummy_read_1_table->align = PAGE_SIZE;
> -       dummy_read_1_table->domain = AMDGPU_GEM_DOMAIN_VRAM;
> +       if (!dummy_read_1_table->size)
> +               return 0;
>
>         ret = amdgpu_bo_create_kernel(adev,
>                                       dummy_read_1_table->size,
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> index 0bcd4fe0ef17..95da6dd1cc65 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> @@ -494,6 +494,8 @@ static int navi10_tables_init(struct smu_context *smu)
>  {
>         struct smu_table_context *smu_table = &smu->smu_table;
>         struct smu_table *tables = smu_table->tables;
> +       struct smu_table *dummy_read_1_table =
> +                       &smu_table->dummy_read_1_table;
>
>         SMU_TABLE_INIT(tables, SMU_TABLE_PPTABLE, sizeof(PPTable_t),
>                        PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
> @@ -513,6 +515,10 @@ static int navi10_tables_init(struct smu_context *smu)
>         SMU_TABLE_INIT(tables, SMU_TABLE_DRIVER_SMU_CONFIG, sizeof(DriverSmuConfig_t),
>                        PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
>
> +       dummy_read_1_table->size = 0x40000;
> +       dummy_read_1_table->align = PAGE_SIZE;
> +       dummy_read_1_table->domain = AMDGPU_GEM_DOMAIN_VRAM;
> +
>         smu_table->metrics_table = kzalloc(sizeof(SmuMetrics_NV1X_t),
>                                            GFP_KERNEL);
>         if (!smu_table->metrics_table)
> --
> 2.25.1
>