From: Rex Zhu Date: Thu, 19 Apr 2018 04:40:15 +0000 (+0800) Subject: drm/amd/pp: Fix NULL point check error in smu_set_watermarks_for_clocks_ranges X-Git-Tag: android-x86-8.1-r1~841^2~16^2~138 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6197ae28911841369ff61ebbdf9d732ff6069138;p=android-x86%2Fkernel.git drm/amd/pp: Fix NULL point check error in smu_set_watermarks_for_clocks_ranges It is caused by 'commit d6c9a7dc86cd ("drm/amd/pp: Move common code to smu_helper.c")' Reviewed-by: Evan Quan Signed-off-by: Rex Zhu Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c index 7c23741619b6..93a3d022ba47 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c @@ -657,7 +657,7 @@ int smu_set_watermarks_for_clocks_ranges(void *wt_table, uint32_t i; struct watermarks *table = wt_table; - if (!table || wm_with_clock_ranges) + if (!table || !wm_with_clock_ranges) return -EINVAL; if (wm_with_clock_ranges->num_wm_sets_dmif > 4 || wm_with_clock_ranges->num_wm_sets_mcif > 4)