drm/amdgpu/psp: move psp version specific function pointers to early_init (9d6fea57) · Commits · 戴 / test

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:

Christian König <christian.koenig@amd.com> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -38,18 +38,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)

		psp->adev = 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;

		ret = psp_init_microcode(psp);
		if (ret) {
		DRM_ERROR("Failed to load psp firmware!\n");

Admin message