Commit 908cebc9 authored by Li Ma's avatar Li Ma Committed by Alex Deucher
Browse files

drm/amd/swsmu: remove fw version check in sw_init. 



dorp fw version check and using max table size to init table.

Signed-off-by: default avatarLi Ma <li.ma@amd.com>
Reviewed-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarYang Wang <kevinyang.wang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 34ec3ced

drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c

+4 −13
Original line number Diff line number Diff line
@@ -234,24 +234,15 @@ static int vangogh_tables_init(struct smu_context *smu) 
		       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);

	SMU_TABLE_INIT(tables, SMU_TABLE_ACTIVITY_MONITOR_COEFF, sizeof(DpmActivityMonitorCoeffExt_t),

		       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);



	if (smu->smc_fw_if_version < 0x3) {

		SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetrics_legacy_t),

				PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);

		smu_table->metrics_table = kzalloc(sizeof(SmuMetrics_legacy_t), GFP_KERNEL);

	} else {

		SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetrics_t),

	SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, max(sizeof(SmuMetrics_t), sizeof(SmuMetrics_legacy_t)),

		       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);

		smu_table->metrics_table = kzalloc(sizeof(SmuMetrics_t), GFP_KERNEL);

	}



	smu_table->metrics_table = kzalloc(max(sizeof(SmuMetrics_t), sizeof(SmuMetrics_legacy_t)), GFP_KERNEL);

	if (!smu_table->metrics_table)

		goto err0_out;

	smu_table->metrics_time = 0;



	if (smu->smc_fw_version >= 0x043F3E00)

		smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_3);

	else

		smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_2);

	smu_table->gpu_metrics_table_size = max(sizeof(struct gpu_metrics_v2_3), sizeof(struct gpu_metrics_v2_2));

	smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);

	if (!smu_table->gpu_metrics_table)

		goto err1_out;