Commit cdb0c632 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amd/powerplay: init table_count for smu tables on asic level 



TABLE_COUNT should be inited in asic level. Because the value may be different
on each asic even on the same ip.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2436911b

drivers/gpu/drm/amd/powerplay/navi10_ppt.c

+3 −0
Original line number Diff line number Diff line
@@ -447,6 +447,9 @@ static const struct pptable_funcs navi10_ppt_funcs = { 


void navi10_set_ppt_funcs(struct smu_context *smu)

{

	struct smu_table_context *smu_table = &smu->smu_table;



	smu->ppt_funcs = &navi10_ppt_funcs;

	smu->smc_if_version = SMU11_DRIVER_IF_VERSION;

	smu_table->table_count = TABLE_COUNT;

}

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

+3 −3
Original line number Diff line number Diff line
@@ -400,15 +400,15 @@ static int smu_v11_0_init_smc_tables(struct smu_context *smu) 
	struct smu_table *tables = NULL;

	int ret = 0;



	if (smu_table->tables || smu_table->table_count != 0)

	if (smu_table->tables || smu_table->table_count == 0)

		return -EINVAL;



	tables = kcalloc(TABLE_COUNT, sizeof(struct smu_table), GFP_KERNEL);

	tables = kcalloc(SMU_TABLE_COUNT, sizeof(struct smu_table),

			 GFP_KERNEL);

	if (!tables)

		return -ENOMEM;



	smu_table->tables = tables;

	smu_table->table_count = TABLE_COUNT;



	SMU_TABLE_INIT(tables, TABLE_PPTABLE, sizeof(PPTable_t),

		       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);

drivers/gpu/drm/amd/powerplay/vega20_ppt.c

+3 −0
Original line number Diff line number Diff line
@@ -2989,6 +2989,9 @@ static const struct pptable_funcs vega20_ppt_funcs = { 


void vega20_set_ppt_funcs(struct smu_context *smu)

{

	struct smu_table_context *smu_table = &smu->smu_table;



	smu->ppt_funcs = &vega20_ppt_funcs;

	smu->smc_if_version = SMU11_DRIVER_IF_VERSION;

	smu_table->table_count = TABLE_COUNT;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE