drm/amd/powerplay: allocate fb for avfs fuse table on vega10.

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
index 9987d5b80d82b846398a69efa3b3463fdccc30fc..5980f02f2ce92ab4d6a8bc5e79f70a5f56697836 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
@@ -515,6 +515,40 @@ static int vega10_smu_init(struct pp_smumgr *smumgr)
                }
        }
 
+       /* allocate space for AVFS Fuse table */
+       smu_allocate_memory(smumgr->device,
+                       sizeof(AvfsFuseOverride_t),
+                       CGS_GPU_MEM_TYPE__VISIBLE_CONTIG_FB,
+                       PAGE_SIZE,
+                       &mc_addr,
+                       &kaddr,
+                       &handle);
+
+       PP_ASSERT_WITH_CODE(kaddr,
+                       "[vega10_smu_init] Out of memory for avfs fuse table.",
+                       kfree(smumgr->backend);
+                       cgs_free_gpu_mem(smumgr->device,
+                       (cgs_handle_t)priv->smu_tables.entry[PPTABLE].handle);
+                       cgs_free_gpu_mem(smumgr->device,
+                       (cgs_handle_t)priv->smu_tables.entry[WMTABLE].handle);
+                       cgs_free_gpu_mem(smumgr->device,
+                       (cgs_handle_t)priv->smu_tables.entry[AVFSTABLE].handle);
+                       cgs_free_gpu_mem(smumgr->device,
+                       (cgs_handle_t)priv->smu_tables.entry[TOOLSTABLE].handle);
+                       cgs_free_gpu_mem(smumgr->device,
+                       (cgs_handle_t)handle);
+                       return -1);
+
+       priv->smu_tables.entry[AVFSFUSETABLE].version = 0x01;
+       priv->smu_tables.entry[AVFSFUSETABLE].size = sizeof(AvfsFuseOverride_t);
+       priv->smu_tables.entry[AVFSFUSETABLE].table_id = TABLE_AVFS_FUSE_OVERRIDE;
+       priv->smu_tables.entry[AVFSFUSETABLE].table_addr_high =
+                       smu_upper_32_bits(mc_addr);
+       priv->smu_tables.entry[AVFSFUSETABLE].table_addr_low =
+                       smu_lower_32_bits(mc_addr);
+       priv->smu_tables.entry[AVFSFUSETABLE].table = kaddr;
+       priv->smu_tables.entry[AVFSFUSETABLE].handle = handle;
+
        return 0;
 }
 
@@ -533,6 +567,8 @@ static int vega10_smu_fini(struct pp_smumgr *smumgr)
                if (priv->smu_tables.entry[TOOLSTABLE].table)
                        cgs_free_gpu_mem(smumgr->device,
                                        (cgs_handle_t)priv->smu_tables.entry[TOOLSTABLE].handle);
+               cgs_free_gpu_mem(smumgr->device,
+                               (cgs_handle_t)priv->smu_tables.entry[AVFSFUSETABLE].handle);
                kfree(smumgr->backend);
                smumgr->backend = NULL;
        }

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h
index 71e9b6492647d76cc7c4879689e43f5e9898e53f..821425c1e4e0ba7b4e3c0af9f269ee0eb9be1bc0 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h
@@ -30,6 +30,7 @@ enum smu_table_id {
        WMTABLE,
        AVFSTABLE,
        TOOLSTABLE,
+       AVFSFUSETABLE,
        MAX_SMU_TABLE,
 };