Commit e9efaaa0 authored Nov 30, 2016 by Xiangliang Yu Committed by Alex Deucher Dec 06, 2016

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@amd.com>
Reviewed-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian KÃ¶nig <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

parent 84f3f05b

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message