[V2 6/6] drm/amd/powerplay: Fix potential NULL pointer issue

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Xiangliang Yu
> Sent: Friday, December 02, 2016 1:04 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Yu, Xiangliang
> Subject: [V2 6/6] 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 at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> index 51a3607..c81cf14 100644
> --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> @@ -1004,12 +1004,12 @@ int amd_powerplay_reset(void *handle)
>  	if (ret)
>  		return ret;
> 
> -	hw_init_power_state_table(instance->hwmgr);
> -
>  	if ((amdgpu_dpm == 0)
>  		|| cgs_is_virtualization_enabled(instance->smu_mgr-
> >device))
>  		return 0;
> 
> +	hw_init_power_state_table(instance->hwmgr);
> +
>  	if (eventmgr == NULL || eventmgr->pp_eventmgr_init == NULL)
>  		return -EINVAL;
> 
> --
> 2.7.4
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx