diff options
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0857-drm-amdgpu-stop-psp-ring-on-suspend.patch')
| -rw-r--r-- | meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0857-drm-amdgpu-stop-psp-ring-on-suspend.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0857-drm-amdgpu-stop-psp-ring-on-suspend.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0857-drm-amdgpu-stop-psp-ring-on-suspend.patch new file mode 100644 index 00000000..370260b0 --- /dev/null +++ b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0857-drm-amdgpu-stop-psp-ring-on-suspend.patch @@ -0,0 +1,56 @@ +From a47880864c54f4203458ec0cac0e6782921648b0 Mon Sep 17 00:00:00 2001 +From: Evan Quan <evan.quan@amd.com> +Date: Fri, 8 Sep 2017 13:09:50 +0800 +Subject: [PATCH 0857/4131] drm/amdgpu: stop psp ring on suspend +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise, the ring will fail to create on next resume. + +Change-Id: Ia25aded6c838ab8022ebf9f42adc9045133343ca +Signed-off-by: Evan Quan <evan.quan@amd.com> +Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> +Acked-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 10 ++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 + + 2 files changed, 11 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +index fea1a86..aaada87 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +@@ -460,6 +460,16 @@ static int psp_hw_fini(void *handle) + + static int psp_suspend(void *handle) + { ++ int ret; ++ struct amdgpu_device *adev = (struct amdgpu_device *)handle; ++ struct psp_context *psp = &adev->psp; ++ ++ ret = psp_ring_stop(psp, PSP_RING_TYPE__KM); ++ if (ret) { ++ DRM_ERROR("PSP ring stop failed\n"); ++ return ret; ++ } ++ + return 0; + } + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +index e79795b..1b7d12d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +@@ -125,6 +125,7 @@ struct amdgpu_psp_funcs { + #define psp_prep_cmd_buf(ucode, type) (psp)->prep_cmd_buf((ucode), (type)) + #define psp_ring_init(psp, type) (psp)->ring_init((psp), (type)) + #define psp_ring_create(psp, type) (psp)->ring_create((psp), (type)) ++#define psp_ring_stop(psp, type) (psp)->ring_stop((psp), (type)) + #define psp_ring_destroy(psp, type) ((psp)->ring_destroy((psp), (type))) + #define psp_cmd_submit(psp, ucode, cmd_mc, fence_mc, index) \ + (psp)->cmd_submit((psp), (ucode), (cmd_mc), (fence_mc), (index)) +-- +2.7.4 + |