openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/powerplay: Fix potential NULL pointer issue 

If doesn't enable dpm, the powerplay will not allocate memory for
hw management. So, hw_init_power_state_table function will reference
NULL pointer when resetting.

Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Reviewed-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
This commit is contained in:
Xiangliang Yu 2016-11-30 14:07:16 +08:00 committed by Alex Deucher
parent 84f3f05b44
commit e9efaaa047
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/powerplay/amd_powerplay.c
View File

@ -1004,12 +1004,12 @@ int amd_powerplay_reset(void *handle)
if (ret) if (ret)
return ret; return ret;
hw_init_power_state_table(instance->hwmgr);
if ((amdgpu_dpm == 0) if ((amdgpu_dpm == 0)
|| cgs_is_virtualization_enabled(instance->smu_mgr->device)) || cgs_is_virtualization_enabled(instance->smu_mgr->device))
return 0; return 0;
hw_init_power_state_table(instance->hwmgr);
if (eventmgr == NULL || eventmgr->pp_eventmgr_init == NULL) if (eventmgr == NULL || eventmgr->pp_eventmgr_init == NULL)
return -EINVAL; return -EINVAL;