korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-26 04:25:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/amd/amdgpu: Clean up memory leak in cz_dpm_init().

Browse Source 
If init fails free up any allocated memory.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tom St Denis 2016-08-25 12:41:15 -04:00 committed by Alex Deucher
parent cc945ce3ab
commit e701f97ff3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/amd/amdgpu/cz_dpm.c
View File

@ -44,6 +44,7 @@
static void cz_dpm_powergate_uvd(struct amdgpu_device *adev, bool gate); static void cz_dpm_powergate_uvd(struct amdgpu_device *adev, bool gate);
static void cz_dpm_powergate_vce(struct amdgpu_device *adev, bool gate); static void cz_dpm_powergate_vce(struct amdgpu_device *adev, bool gate);
static void cz_dpm_fini(struct amdgpu_device *adev);
static struct cz_ps *cz_get_ps(struct amdgpu_ps *rps) static struct cz_ps *cz_get_ps(struct amdgpu_ps *rps)
{ {
@ -411,11 +412,11 @@ static int cz_dpm_init(struct amdgpu_device *adev)
ret = amdgpu_get_platform_caps(adev); ret = amdgpu_get_platform_caps(adev);
if (ret) if (ret)
return ret; goto err;
ret = amdgpu_parse_extended_power_table(adev); ret = amdgpu_parse_extended_power_table(adev);
if (ret) if (ret)
return ret; goto err;
pi->sram_end = SMC_RAM_END; pi->sram_end = SMC_RAM_END;
@ -469,23 +470,26 @@ static int cz_dpm_init(struct amdgpu_device *adev)
ret = cz_parse_sys_info_table(adev); ret = cz_parse_sys_info_table(adev);
if (ret) if (ret)
return ret; goto err;
cz_patch_voltage_values(adev); cz_patch_voltage_values(adev);
cz_construct_boot_state(adev); cz_construct_boot_state(adev);
ret = cz_parse_power_table(adev); ret = cz_parse_power_table(adev);
if (ret) if (ret)
return ret; goto err;
ret = cz_process_firmware_header(adev); ret = cz_process_firmware_header(adev);
if (ret) if (ret)
return ret; goto err;
pi->dpm_enabled = true; pi->dpm_enabled = true;
pi->uvd_dynamic_pg = false; pi->uvd_dynamic_pg = false;
return 0; return 0;
err:
cz_dpm_fini(adev);
return ret;
} }
static void cz_dpm_fini(struct amdgpu_device *adev) static void cz_dpm_fini(struct amdgpu_device *adev)