diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1799-drm-amdgpu-revert-fix-deadlock-of-reservation-betwee.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1799-drm-amdgpu-revert-fix-deadlock-of-reservation-betwee.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1799-drm-amdgpu-revert-fix-deadlock-of-reservation-betwee.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1799-drm-amdgpu-revert-fix-deadlock-of-reservation-betwee.patch new file mode 100644 index 00000000..1f4de61e --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1799-drm-amdgpu-revert-fix-deadlock-of-reservation-betwee.patch @@ -0,0 +1,52 @@ +From 6d67ef14d229b287466922f85829d2f883a5ab06 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 5 Sep 2017 15:10:50 +0200 +Subject: [PATCH 1799/4131] drm/amdgpu: revert "fix deadlock of reservation + between cs and gpu reset v2" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 10e709cb296c98424c03408d23e3addeddcd4088. + +The patch doesn't work at all: +1. The CS can still be blocked because of amdgpu_ctx_add_fence(). +2. The order of submission isn't correct any more. +3. We could end up using freed up memory because we now drop the + ctx reference to early. + +This needs to be fixed cleanly by doing the context handling after the BO +handling, but this is a larger task just avoid the obvious crashes for now. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Monk Liu monk.liu@amd.com +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index 1b903a7..5327c04 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -1201,7 +1201,6 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, + cs->out.handle = amdgpu_ctx_add_fence(p->ctx, ring, p->fence); + job->uf_sequence = cs->out.handle; + amdgpu_job_free_resources(job); +- amdgpu_cs_parser_fini(p, 0, true); + + trace_amdgpu_cs_ioctl(job); + amd_sched_entity_push_job(&job->base); +@@ -1259,10 +1258,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) + goto out; + + r = amdgpu_cs_submit(&parser, cs); +- if (r) +- goto out; + +- return 0; + out: + amdgpu_cs_parser_fini(&parser, r, reserved_buffers); + return r; +-- +2.7.4 + |