diff options
| author | Huang Rui <ray.huang@amd.com> | 2018-05-18 10:39:16 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-06-13 13:45:21 -0500 |
| commit | 7584498c1c67bba4d1f5a0f7bf48c9a50c3ff5c8 (patch) | |
| tree | aa6f1045cf418242a71a709d07ec4ee1dbfec490 /drivers/gpu/drm | |
| parent | 06b18f61ee78f8c69417c3a5e4f21ed678662315 (diff) | |
| download | linux-7584498c1c67bba4d1f5a0f7bf48c9a50c3ff5c8.tar.bz2 | |
drm/amd/powerplay: fix missed hwmgr check warning before call gfx_off_control handler
Patch 9667849bbb8d: "drm/amd/powerplay: add control gfxoff enabling in late
init" from Mar 13, 2018, leads to the following static checker warning:
drivers/gpu/drm/amd/amdgpu/../powerplay/amd_powerplay.c:194
pp_late_init()
error: we previously assumed 'hwmgr' could be null (see line 185)
drivers/gpu/drm/amd/amdgpu/../powerplay/amd_powerplay.c
This patch fixes the warning to add hwmgr checking.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index d0e6e2dd6bc6..0969b65003ed 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c @@ -191,7 +191,8 @@ static int pp_late_init(void *handle) if (adev->pm.smu_prv_buffer_size != 0) pp_reserve_vram_for_smu(adev); - if (hwmgr->hwmgr_func->gfx_off_control && + if (hwmgr && hwmgr->hwmgr_func && + hwmgr->hwmgr_func->gfx_off_control && (hwmgr->feature_mask & PP_GFXOFF_MASK)) { ret = hwmgr->hwmgr_func->gfx_off_control(hwmgr, true); if (ret) |