diff options
| author | Alex Deucher | 2019-05-09 04:45:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-11 12:20:55 +0200 |
| commit | 748a97ec6c1588e3a49e09fe9ca56dcdb7f976b5 (patch) | |
| tree | fabc229fef30408b9212cc3ea1cf9ab69559ce26 /drivers/gpu/drm/amd | |
| parent | drm: add non-desktop quirks to Sensics and OSVR headsets. (diff) | |
| download | kernel-qcow2-linux-748a97ec6c1588e3a49e09fe9ca56dcdb7f976b5.tar.gz kernel-qcow2-linux-748a97ec6c1588e3a49e09fe9ca56dcdb7f976b5.tar.xz kernel-qcow2-linux-748a97ec6c1588e3a49e09fe9ca56dcdb7f976b5.zip | |
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: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 5b39d1399630..5be82e4fd1da 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -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"); |