diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0880-drm-amd-powerplay-hwmgr-Remove-null-check-before-kfr.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0880-drm-amd-powerplay-hwmgr-Remove-null-check-before-kfr.patch | 244 |
1 files changed, 0 insertions, 244 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0880-drm-amd-powerplay-hwmgr-Remove-null-check-before-kfr.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0880-drm-amd-powerplay-hwmgr-Remove-null-check-before-kfr.patch deleted file mode 100644 index 282f14f4..00000000 --- a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0880-drm-amd-powerplay-hwmgr-Remove-null-check-before-kfr.patch +++ /dev/null @@ -1,244 +0,0 @@ -From bd79d2d0a0a9c3a952c610ab2016bb9984eb4d14 Mon Sep 17 00:00:00 2001 -From: Himanshu Jha <himanshujha199640@gmail.com> -Date: Tue, 29 Aug 2017 18:42:27 +0530 -Subject: [PATCH 0880/4131] drm/amd/powerplay/hwmgr: Remove null check before - kfree -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -kfree on NULL pointer is a no-op and therefore checking is redundant. - -Reviewed-by: Harry Wentland <harry.wentland@amd.com> -Reviewed-by: Rex Zhu <Rex.Zhu@amd.com> -Reviewed-by: Christian König <christian.koenig@amd.com> -Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 6 +- - .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 96 ++++++++-------------- - drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 44 ++++------ - drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 12 +-- - 4 files changed, 53 insertions(+), 105 deletions(-) - -diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c -index bc839ff..9f2c037 100644 ---- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c -+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c -@@ -1225,10 +1225,8 @@ static int cz_hwmgr_backend_fini(struct pp_hwmgr *hwmgr) - phm_destroy_table(hwmgr, &(hwmgr->power_down_asic)); - phm_destroy_table(hwmgr, &(hwmgr->setup_asic)); - -- if (NULL != hwmgr->dyn_state.vddc_dep_on_dal_pwrl) { -- kfree(hwmgr->dyn_state.vddc_dep_on_dal_pwrl); -- hwmgr->dyn_state.vddc_dep_on_dal_pwrl = NULL; -- } -+ kfree(hwmgr->dyn_state.vddc_dep_on_dal_pwrl); -+ hwmgr->dyn_state.vddc_dep_on_dal_pwrl = NULL; - - kfree(hwmgr->backend); - hwmgr->backend = NULL; -diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c -index 0f61e67..485f7eb 100644 ---- a/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c -+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c -@@ -1652,85 +1652,53 @@ static int pp_tables_uninitialize(struct pp_hwmgr *hwmgr) - if (hwmgr->chip_id == CHIP_RAVEN) - return 0; - -- if (NULL != hwmgr->dyn_state.vddc_dependency_on_sclk) { -- kfree(hwmgr->dyn_state.vddc_dependency_on_sclk); -- hwmgr->dyn_state.vddc_dependency_on_sclk = NULL; -- } -+ kfree(hwmgr->dyn_state.vddc_dependency_on_sclk); -+ hwmgr->dyn_state.vddc_dependency_on_sclk = NULL; - -- if (NULL != hwmgr->dyn_state.vddci_dependency_on_mclk) { -- kfree(hwmgr->dyn_state.vddci_dependency_on_mclk); -- hwmgr->dyn_state.vddci_dependency_on_mclk = NULL; -- } -+ kfree(hwmgr->dyn_state.vddci_dependency_on_mclk); -+ hwmgr->dyn_state.vddci_dependency_on_mclk = NULL; - -- if (NULL != hwmgr->dyn_state.vddc_dependency_on_mclk) { -- kfree(hwmgr->dyn_state.vddc_dependency_on_mclk); -- hwmgr->dyn_state.vddc_dependency_on_mclk = NULL; -- } -+ kfree(hwmgr->dyn_state.vddc_dependency_on_mclk); -+ hwmgr->dyn_state.vddc_dependency_on_mclk = NULL; - -- if (NULL != hwmgr->dyn_state.mvdd_dependency_on_mclk) { -- kfree(hwmgr->dyn_state.mvdd_dependency_on_mclk); -- hwmgr->dyn_state.mvdd_dependency_on_mclk = NULL; -- } -+ kfree(hwmgr->dyn_state.mvdd_dependency_on_mclk); -+ hwmgr->dyn_state.mvdd_dependency_on_mclk = NULL; - -- if (NULL != hwmgr->dyn_state.valid_mclk_values) { -- kfree(hwmgr->dyn_state.valid_mclk_values); -- hwmgr->dyn_state.valid_mclk_values = NULL; -- } -+ kfree(hwmgr->dyn_state.valid_mclk_values); -+ hwmgr->dyn_state.valid_mclk_values = NULL; - -- if (NULL != hwmgr->dyn_state.valid_sclk_values) { -- kfree(hwmgr->dyn_state.valid_sclk_values); -- hwmgr->dyn_state.valid_sclk_values = NULL; -- } -+ kfree(hwmgr->dyn_state.valid_sclk_values); -+ hwmgr->dyn_state.valid_sclk_values = NULL; - -- if (NULL != hwmgr->dyn_state.cac_leakage_table) { -- kfree(hwmgr->dyn_state.cac_leakage_table); -- hwmgr->dyn_state.cac_leakage_table = NULL; -- } -+ kfree(hwmgr->dyn_state.cac_leakage_table); -+ hwmgr->dyn_state.cac_leakage_table = NULL; - -- if (NULL != hwmgr->dyn_state.vddc_phase_shed_limits_table) { -- kfree(hwmgr->dyn_state.vddc_phase_shed_limits_table); -- hwmgr->dyn_state.vddc_phase_shed_limits_table = NULL; -- } -+ kfree(hwmgr->dyn_state.vddc_phase_shed_limits_table); -+ hwmgr->dyn_state.vddc_phase_shed_limits_table = NULL; - -- if (NULL != hwmgr->dyn_state.vce_clock_voltage_dependency_table) { -- kfree(hwmgr->dyn_state.vce_clock_voltage_dependency_table); -- hwmgr->dyn_state.vce_clock_voltage_dependency_table = NULL; -- } -+ kfree(hwmgr->dyn_state.vce_clock_voltage_dependency_table); -+ hwmgr->dyn_state.vce_clock_voltage_dependency_table = NULL; - -- if (NULL != hwmgr->dyn_state.uvd_clock_voltage_dependency_table) { -- kfree(hwmgr->dyn_state.uvd_clock_voltage_dependency_table); -- hwmgr->dyn_state.uvd_clock_voltage_dependency_table = NULL; -- } -+ kfree(hwmgr->dyn_state.uvd_clock_voltage_dependency_table); -+ hwmgr->dyn_state.uvd_clock_voltage_dependency_table = NULL; - -- if (NULL != hwmgr->dyn_state.samu_clock_voltage_dependency_table) { -- kfree(hwmgr->dyn_state.samu_clock_voltage_dependency_table); -- hwmgr->dyn_state.samu_clock_voltage_dependency_table = NULL; -- } -+ kfree(hwmgr->dyn_state.samu_clock_voltage_dependency_table); -+ hwmgr->dyn_state.samu_clock_voltage_dependency_table = NULL; - -- if (NULL != hwmgr->dyn_state.acp_clock_voltage_dependency_table) { -- kfree(hwmgr->dyn_state.acp_clock_voltage_dependency_table); -- hwmgr->dyn_state.acp_clock_voltage_dependency_table = NULL; -- } -+ kfree(hwmgr->dyn_state.acp_clock_voltage_dependency_table); -+ hwmgr->dyn_state.acp_clock_voltage_dependency_table = NULL; - -- if (NULL != hwmgr->dyn_state.cac_dtp_table) { -- kfree(hwmgr->dyn_state.cac_dtp_table); -- hwmgr->dyn_state.cac_dtp_table = NULL; -- } -+ kfree(hwmgr->dyn_state.cac_dtp_table); -+ hwmgr->dyn_state.cac_dtp_table = NULL; - -- if (NULL != hwmgr->dyn_state.ppm_parameter_table) { -- kfree(hwmgr->dyn_state.ppm_parameter_table); -- hwmgr->dyn_state.ppm_parameter_table = NULL; -- } -+ kfree(hwmgr->dyn_state.ppm_parameter_table); -+ hwmgr->dyn_state.ppm_parameter_table = NULL; - -- if (NULL != hwmgr->dyn_state.vdd_gfx_dependency_on_sclk) { -- kfree(hwmgr->dyn_state.vdd_gfx_dependency_on_sclk); -- hwmgr->dyn_state.vdd_gfx_dependency_on_sclk = NULL; -- } -+ kfree(hwmgr->dyn_state.vdd_gfx_dependency_on_sclk); -+ hwmgr->dyn_state.vdd_gfx_dependency_on_sclk = NULL; - -- if (NULL != hwmgr->dyn_state.vq_budgeting_table) { -- kfree(hwmgr->dyn_state.vq_budgeting_table); -- hwmgr->dyn_state.vq_budgeting_table = NULL; -- } -+ kfree(hwmgr->dyn_state.vq_budgeting_table); -+ hwmgr->dyn_state.vq_budgeting_table = NULL; - - return 0; - } -diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c -index 5782a68..8a0cd3b 100644 ---- a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c -+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c -@@ -553,35 +553,21 @@ static int rv_hwmgr_backend_fini(struct pp_hwmgr *hwmgr) - phm_destroy_table(hwmgr, &(hwmgr->power_down_asic)); - phm_destroy_table(hwmgr, &(hwmgr->setup_asic)); - -- if (pinfo->vdd_dep_on_dcefclk) { -- kfree(pinfo->vdd_dep_on_dcefclk); -- pinfo->vdd_dep_on_dcefclk = NULL; -- } -- if (pinfo->vdd_dep_on_socclk) { -- kfree(pinfo->vdd_dep_on_socclk); -- pinfo->vdd_dep_on_socclk = NULL; -- } -- if (pinfo->vdd_dep_on_fclk) { -- kfree(pinfo->vdd_dep_on_fclk); -- pinfo->vdd_dep_on_fclk = NULL; -- } -- if (pinfo->vdd_dep_on_dispclk) { -- kfree(pinfo->vdd_dep_on_dispclk); -- pinfo->vdd_dep_on_dispclk = NULL; -- } -- if (pinfo->vdd_dep_on_dppclk) { -- kfree(pinfo->vdd_dep_on_dppclk); -- pinfo->vdd_dep_on_dppclk = NULL; -- } -- if (pinfo->vdd_dep_on_phyclk) { -- kfree(pinfo->vdd_dep_on_phyclk); -- pinfo->vdd_dep_on_phyclk = NULL; -- } -- -- if (NULL != hwmgr->dyn_state.vddc_dep_on_dal_pwrl) { -- kfree(hwmgr->dyn_state.vddc_dep_on_dal_pwrl); -- hwmgr->dyn_state.vddc_dep_on_dal_pwrl = NULL; -- } -+ kfree(pinfo->vdd_dep_on_dcefclk); -+ pinfo->vdd_dep_on_dcefclk = NULL; -+ kfree(pinfo->vdd_dep_on_socclk); -+ pinfo->vdd_dep_on_socclk = NULL; -+ kfree(pinfo->vdd_dep_on_fclk); -+ pinfo->vdd_dep_on_fclk = NULL; -+ kfree(pinfo->vdd_dep_on_dispclk); -+ pinfo->vdd_dep_on_dispclk = NULL; -+ kfree(pinfo->vdd_dep_on_dppclk); -+ pinfo->vdd_dep_on_dppclk = NULL; -+ kfree(pinfo->vdd_dep_on_phyclk); -+ pinfo->vdd_dep_on_phyclk = NULL; -+ -+ kfree(hwmgr->dyn_state.vddc_dep_on_dal_pwrl); -+ hwmgr->dyn_state.vddc_dep_on_dal_pwrl = NULL; - - kfree(hwmgr->backend); - hwmgr->backend = NULL; -diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c -index 336fdd8..5d5a813 100644 ---- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c -+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c -@@ -2282,15 +2282,11 @@ static int smu7_set_private_data_based_on_pptable_v0(struct pp_hwmgr *hwmgr) - - static int smu7_hwmgr_backend_fini(struct pp_hwmgr *hwmgr) - { -- if (NULL != hwmgr->dyn_state.vddc_dep_on_dal_pwrl) { -- kfree(hwmgr->dyn_state.vddc_dep_on_dal_pwrl); -- hwmgr->dyn_state.vddc_dep_on_dal_pwrl = NULL; -- } -+ kfree(hwmgr->dyn_state.vddc_dep_on_dal_pwrl); -+ hwmgr->dyn_state.vddc_dep_on_dal_pwrl = NULL; - pp_smu7_thermal_fini(hwmgr); -- if (NULL != hwmgr->backend) { -- kfree(hwmgr->backend); -- hwmgr->backend = NULL; -- } -+ kfree(hwmgr->backend); -+ hwmgr->backend = NULL; - - return 0; - } --- -2.7.4 - |