From e1ae89ea43d7d6d716f1b32e2fb6928065b4972a Mon Sep 17 00:00:00 2001 From: mercuriete Date: Mon, 12 Mar 2018 22:16:41 +0100 Subject: [PATCH] fixing null dereference --- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c index 22f0b7ff3ac9..d0fb808648fc 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c @@ -5158,7 +5158,6 @@ static int si_init_smc_table(struct amdgpu_device *adev) const struct si_ulv_param *ulv = &si_pi->ulv; SISLANDS_SMC_STATETABLE *table = &si_pi->smc_statetable; int ret; - u32 lane_width; u32 vr_hot_gpio; si_populate_smc_voltage_tables(adev, table); @@ -5226,9 +5225,6 @@ static int si_init_smc_table(struct amdgpu_device *adev) WREG32(CG_ULV_CONTROL, ulv->cg_ulv_control); WREG32(CG_ULV_PARAMETER, ulv->cg_ulv_parameter); - - lane_width = amdgpu_get_pcie_lanes(adev); - si_write_smc_soft_register(adev, SI_SMC_SOFT_REGISTER_non_ulv_pcie_link_width, lane_width); } else { table->ULVState = table->initialState; } @@ -6364,23 +6360,6 @@ static int si_patch_dependency_tables_based_on_leakage(struct amdgpu_device *ade return ret; } -static void si_set_pcie_lane_width_in_smc(struct amdgpu_device *adev, - struct amdgpu_ps *amdgpu_new_state, - struct amdgpu_ps *amdgpu_current_state) -{ - u32 lane_width; - u32 new_lane_width = - (amdgpu_new_state->caps & ATOM_PPLIB_PCIE_LINK_WIDTH_MASK) >> ATOM_PPLIB_PCIE_LINK_WIDTH_SHIFT; - u32 current_lane_width = - (amdgpu_current_state->caps & ATOM_PPLIB_PCIE_LINK_WIDTH_MASK) >> ATOM_PPLIB_PCIE_LINK_WIDTH_SHIFT; - - if (new_lane_width != current_lane_width) { - amdgpu_set_pcie_lanes(adev, new_lane_width); - lane_width = amdgpu_get_pcie_lanes(adev); - si_write_smc_soft_register(adev, SI_SMC_SOFT_REGISTER_non_ulv_pcie_link_width, lane_width); - } -} - static void si_dpm_setup_asic(struct amdgpu_device *adev) { si_read_clock_registers(adev); @@ -7033,8 +7012,6 @@ static int si_dpm_set_power_state(void *handle) DRM_ERROR("si_program_memory_timing_parameters failed\n"); return ret; } - si_set_pcie_lane_width_in_smc(adev, new_ps, old_ps); - ret = si_resume_smc(adev); if (ret) { DRM_ERROR("si_resume_smc failed\n"); -- 2.16.1