Skip to content

L
linux
Commit becfa698 authored by Alex Deucher's avatar Alex Deucher
Browse files
Options

drm/radeon/dpm: clean up the extended table error pathes 

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 018042b1
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 34 deletions
drivers/gpu/drm/radeon/r600_dpm.c
View file @ becfa698
...@@ -919,10 +919,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) ...@@ -919,10 +919,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev)
sizeof(struct radeon_phase_shedding_limits_entry), sizeof(struct radeon_phase_shedding_limits_entry),
GFP_KERNEL); GFP_KERNEL);
if (!rdev->pm.dpm.dyn_state.phase_shedding_limits_table.entries) { if (!rdev->pm.dpm.dyn_state.phase_shedding_limits_table.entries) {
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries); r600_free_extended_power_table(rdev);
kfree(rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.mvdd_dependency_on_mclk.entries);
return -ENOMEM; return -ENOMEM;
} }
...@@ -964,10 +961,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) ...@@ -964,10 +961,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev)
u32 size = cac_table->ucNumEntries * sizeof(struct radeon_cac_leakage_table); u32 size = cac_table->ucNumEntries * sizeof(struct radeon_cac_leakage_table);
rdev->pm.dpm.dyn_state.cac_leakage_table.entries = kzalloc(size, GFP_KERNEL); rdev->pm.dpm.dyn_state.cac_leakage_table.entries = kzalloc(size, GFP_KERNEL);
if (!rdev->pm.dpm.dyn_state.cac_leakage_table.entries) { if (!rdev->pm.dpm.dyn_state.cac_leakage_table.entries) {
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries); r600_free_extended_power_table(rdev);
kfree(rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.mvdd_dependency_on_mclk.entries);
return -ENOMEM; return -ENOMEM;
} }
for (i = 0; i < cac_table->ucNumEntries; i++) { for (i = 0; i < cac_table->ucNumEntries; i++) {
...@@ -1010,11 +1004,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) ...@@ -1010,11 +1004,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev)
rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries = rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries =
kzalloc(size, GFP_KERNEL); kzalloc(size, GFP_KERNEL);
if (!rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries) { if (!rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries) {
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries); r600_free_extended_power_table(rdev);
kfree(rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.mvdd_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.cac_leakage_table.entries);
return -ENOMEM; return -ENOMEM;
} }
rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.count = rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.count =
...@@ -1045,12 +1035,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) ...@@ -1045,12 +1035,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev)
rdev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries = rdev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries =
kzalloc(size, GFP_KERNEL); kzalloc(size, GFP_KERNEL);
if (!rdev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries) { if (!rdev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries) {
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries); r600_free_extended_power_table(rdev);
kfree(rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.mvdd_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.cac_leakage_table.entries);
kfree(rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries);
return -ENOMEM; return -ENOMEM;
} }
rdev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.count = rdev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.count =
...@@ -1074,13 +1059,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) ...@@ -1074,13 +1059,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev)
rdev->pm.dpm.dyn_state.ppm_table = rdev->pm.dpm.dyn_state.ppm_table =
kzalloc(sizeof(struct radeon_ppm_table), GFP_KERNEL); kzalloc(sizeof(struct radeon_ppm_table), GFP_KERNEL);
if (!rdev->pm.dpm.dyn_state.ppm_table) { if (!rdev->pm.dpm.dyn_state.ppm_table) {
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries); r600_free_extended_power_table(rdev);
kfree(rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.mvdd_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.cac_leakage_table.entries);
kfree(rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries);
kfree(rdev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries);
return -ENOMEM; return -ENOMEM;
} }
rdev->pm.dpm.dyn_state.ppm_table->ppm_design = ppm->ucPpmDesign; rdev->pm.dpm.dyn_state.ppm_table->ppm_design = ppm->ucPpmDesign;
...@@ -1111,14 +1090,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) ...@@ -1111,14 +1090,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev)
rdev->pm.dpm.dyn_state.cac_tdp_table = rdev->pm.dpm.dyn_state.cac_tdp_table =
kzalloc(sizeof(struct radeon_cac_tdp_table), GFP_KERNEL); kzalloc(sizeof(struct radeon_cac_tdp_table), GFP_KERNEL);
if (!rdev->pm.dpm.dyn_state.cac_tdp_table) { if (!rdev->pm.dpm.dyn_state.cac_tdp_table) {
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk.entries); r600_free_extended_power_table(rdev);
kfree(rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.mvdd_dependency_on_mclk.entries);
kfree(rdev->pm.dpm.dyn_state.cac_leakage_table.entries);
kfree(rdev->pm.dpm.dyn_state.ppm_table);
kfree(rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries);
kfree(rdev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries);
return -ENOMEM; return -ENOMEM;
} }
if (rev > 0) { if (rev > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7