leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu/powerplay: fix NULL pointer issue when SMU disabled

Browse Source 
Fix smu related NULL pointer issue which occurs when SMU is disabled.

Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Likun Gao 2019-12-25 17:42:35 +08:00 committed by Alex Deucher
parent d2f925ff9a
commit e78adc5a1d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
View File

@ -1904,8 +1904,14 @@ int smu_write_watermarks_table(struct smu_context *smu)
int smu_set_watermarks_for_clock_ranges(struct smu_context *smu,
struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges)
{
struct smu_table *watermarks = &smu->smu_table.tables[SMU_TABLE_WATERMARKS];
void *table = watermarks->cpu_addr;
struct smu_table *watermarks;
void *table;
if (!smu->smu_table.tables)
return 0;
watermarks = &smu->smu_table.tables[SMU_TABLE_WATERMARKS];
table = watermarks->cpu_addr;
mutex_lock(&smu->mutex);
@ -2397,7 +2403,7 @@ bool smu_baco_is_support(struct smu_context *smu)
mutex_lock(&smu->mutex);
if (smu->ppt_funcs->baco_is_support)
if (smu->ppt_funcs && smu->ppt_funcs->baco_is_support)
ret = smu->ppt_funcs->baco_is_support(smu);
mutex_unlock(&smu->mutex);