diff options
| author |   wentalou <Wentao.Lou@amd.com> | 2018-12-18 15:42:08 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-20 09:17:03 +0200 |
| commit | 3fcb0274953088d0e32092cac0706235bdce7ff6 (patch) | |
| tree | 7665f8f97bc010cdb34592d4a72e9857b96aefbc | |
| parent | e7ab5c78e51653c411af66308dada30f15b02413 (diff) | |
| download | linux-yocto-3fcb0274953088d0e32092cac0706235bdce7ff6.tar.gz linux-yocto-3fcb0274953088d0e32092cac0706235bdce7ff6.tar.bz2 linux-yocto-3fcb0274953088d0e32092cac0706235bdce7ff6.zip | |
drm/amdgpu: psp_ring_destroy cause psp->km_ring.ring_mem NULL
[ Upstream commit 14d20ec7f31ef96a2e7dcf7880b13dde1d473b56 ]
psp_ring_destroy inside psp_load_fw cause psp->km_ring.ring_mem NULL.
Call Trace occurred when psp_cmd_submit.
should be psp_ring_stop instead.
Reviewed-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 3a9b48b227ac..a7208ca0bfe3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -546,7 +546,7 @@ static int psp_load_fw(struct amdgpu_device *adev) struct psp_context *psp = &adev->psp; if (amdgpu_sriov_vf(adev) && adev->in_gpu_reset) { - psp_ring_destroy(psp, PSP_RING_TYPE__KM); + psp_ring_stop(psp, PSP_RING_TYPE__KM); /* should not destroy ring, only stop */ goto skip_memalloc; } |