Commit 8a358aaa authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amd/pm: Free SMUv13.0.6 resources on failure 



Free the resources allocated if smu_v13_0_12_tables_init fails.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Fixes: 5bf93e1d ("drm/amd/pm: Add caching to SMUv13.0.12 temp metric")
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 655d6403

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c

+3 −1
Original line number Diff line number Diff line
@@ -161,8 +161,10 @@ int smu_v13_0_12_tables_init(struct smu_context *smu) 
	/* Initialize GPU board temperature metrics */

	ret = smu_table_cache_init(smu, SMU_TABLE_GPUBOARD_TEMP_METRICS,

				   sizeof(*gpuboard_temp_metrics), 50);

	if (ret)

	if (ret) {

		smu_table_cache_fini(smu, SMU_TABLE_BASEBOARD_TEMP_METRICS);

		return ret;

	}

	cache = &(tables[SMU_TABLE_GPUBOARD_TEMP_METRICS].cache);

	gpuboard_temp_metrics = (struct amdgpu_gpuboard_temp_metrics_v1_0 *)cache->buffer;

	smu_cmn_init_gpuboard_temp_metrics(gpuboard_temp_metrics, 1, 0);

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

+10 −2
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ static int smu_v13_0_6_tables_init(struct smu_context *smu) 
	struct smu_table *tables = smu_table->tables;

	struct amdgpu_device *adev = smu->adev;

	int gpu_metrcs_size = METRICS_TABLE_SIZE;

	int ret;



	if (!(adev->flags & AMD_IS_APU))

		SMU_TABLE_INIT(tables, SMU_TABLE_PMSTATUSLOG, SMU13_TOOL_SIZE,
@@ -573,8 +574,15 @@ static int smu_v13_0_6_tables_init(struct smu_context *smu) 
		return -ENOMEM;

	}



	if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12))

		return smu_v13_0_12_tables_init(smu);

	if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) ==

	    IP_VERSION(13, 0, 12)) {

		ret = smu_v13_0_12_tables_init(smu);

		if (ret) {

			kfree(smu_table->metrics_table);

			kfree(smu_table->gpu_metrics_table);

			return ret;

		}

	}



	return 0;

}