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

Commit 748a97ec authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu/psp: move psp version specific function pointers to early_init 



commit 9d6fea5744d6798353f37ac42a8a653a2607ca69 upstream.

In case we need to use them for GPU reset prior initializing the
asic.  Fixes a crash if the driver attempts to reset the GPU at driver
load time.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98a8cb02

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

+10 −9
Original line number Diff line number Diff line
@@ -37,18 +37,10 @@ static void psp_set_funcs(struct amdgpu_device *adev); 
static int psp_early_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct psp_context *psp = &adev->psp;



	psp_set_funcs(adev);



	return 0;

}



static int psp_sw_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct psp_context *psp = &adev->psp;

	int ret;



	switch (adev->asic_type) {

	case CHIP_VEGA10:

	case CHIP_VEGA12:
@@ -67,6 +59,15 @@ static int psp_sw_init(void *handle) 
	if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)

		return 0;



	return 0;

}



static int psp_sw_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct psp_context *psp = &adev->psp;

	int ret;



	ret = psp_init_microcode(psp);

	if (ret) {

		DRM_ERROR("Failed to load psp firmware!\n");