Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6dcfd9c authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher
Browse files

drm/amdgpu: fix pplib finish bug 



1,should use late_fini to kfree all resource otherwise
the released pointer maybe accessed in IRQ ip fini routine.

2,hwmgr should not be kfree by pem_fini which is invoked
by hw fini path.

Signed-off-by: default avatarMonk Liu <Monk.Liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 482587e3

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+5 −0
Original line number Diff line number Diff line
@@ -1325,6 +1325,11 @@ static int amdgpu_fini(struct amdgpu_device *adev) 
		adev->ip_block_status[i].valid = false;

	}



	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {

		if (adev->ip_blocks[i].funcs->late_fini)

			adev->ip_blocks[i].funcs->late_fini((void *)adev);

	}



	return 0;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c

+0 −7
Original line number Diff line number Diff line
@@ -183,13 +183,6 @@ static int amdgpu_pp_sw_fini(void *handle) 
	if (ret)

		return ret;



#ifdef CONFIG_DRM_AMD_POWERPLAY

	if (adev->pp_enabled) {

		amdgpu_pm_sysfs_fini(adev);

		amd_powerplay_fini(adev->powerplay.pp_handle);

	}

#endif



	return ret;

}

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

+0 −3
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ static void pem_fini(struct pp_eventmgr *eventmgr) 
	pem_unregister_interrupts(eventmgr);



	pem_handle_event(eventmgr, AMD_PP_EVENT_UNINITIALIZE, &event_data);



	if (eventmgr != NULL)

		kfree(eventmgr);

}



int eventmgr_init(struct pp_instance *handle)