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

[Huang Rui]

On Thu, Dec 26, 2019 at 01:06:33PM +0800, Likun Gao wrote:
> From: Likun Gao <Likun.Gao at amd.com>
> 
> Fix smu related NULL pointer issue which occurs when SMU is disabled.
> 
> Signed-off-by: Likun Gao <Likun.Gao at amd.com>

Reviewed-by: Huang Rui <ray.huang at amd.com>

> ---
>  drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> index d07c4f2..3724085 100644
> --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> @@ -1905,8 +1905,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);
>  
> @@ -2398,7 +2404,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);
> -- 
> 2.7.4
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cray.huang%40amd.com%7C8178f1e683574741c2c208d789c17815%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637129336353672102&sdata=yuJP7XrQbabqM11I8sdymfpCTi9cBmQyqc8mx9l%2Fe4c%3D&reserved=0