diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1852-drm-amdgpu-make-ctx_add_fence-interruptible-v2.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1852-drm-amdgpu-make-ctx_add_fence-interruptible-v2.patch | 124 |
1 files changed, 124 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1852-drm-amdgpu-make-ctx_add_fence-interruptible-v2.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1852-drm-amdgpu-make-ctx_add_fence-interruptible-v2.patch new file mode 100644 index 00000000..02418616 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1852-drm-amdgpu-make-ctx_add_fence-interruptible-v2.patch @@ -0,0 +1,124 @@ +From 0e2dba92d8ee58b89667d945181ca63f6a621ba7 Mon Sep 17 00:00:00 2001 +From: Monk Liu <Monk.Liu@amd.com> +Date: Fri, 15 Sep 2017 13:40:31 +0800 +Subject: [PATCH 1852/4131] drm/amdgpu:make ctx_add_fence interruptible(v2) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +otherwise a gpu hang will make application couldn't be killed +under timedout=0 mode + +v2: +Fix memoryleak job/job->s_fence issue +unlock mn +remove the ERROR msg after waiting being interrupted + +Change-Id: I6051b5b3ae1188983f49325a2438c84a6c12374a +Signed-off-by: Monk Liu <Monk.Liu@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> + + Conflicts: + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 16 ++++++++++++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 12 +++++++----- + 3 files changed, 23 insertions(+), 9 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 4419415..51efba7 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -758,8 +758,8 @@ struct amdgpu_ctx_mgr { + struct amdgpu_ctx *amdgpu_ctx_get(struct amdgpu_fpriv *fpriv, uint32_t id); + int amdgpu_ctx_put(struct amdgpu_ctx *ctx); + +-uint64_t amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring, +- struct dma_fence *fence); ++int amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring, ++ struct dma_fence *fence, uint64_t *seq); + struct dma_fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx, + struct amdgpu_ring *ring, uint64_t seq); + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index 70a9c65..6c8eca5 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -1172,6 +1172,8 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, + struct amd_sched_entity *entity = &p->ctx->rings[ring->idx].entity; + struct amdgpu_job *job; + unsigned i; ++ uint64_t seq; ++ + int r; + + amdgpu_mn_lock(p->mn); +@@ -1201,12 +1203,22 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, + job->fence_ctx = entity->fence_context; + p->fence = dma_fence_get(&job->base.s_fence->finished); + ++ r = amdgpu_ctx_add_fence(p->ctx, ring, p->fence, &seq); ++ if (r) { ++ dma_fence_put(p->fence); ++ dma_fence_put(&job->base.s_fence->finished); ++ amdgpu_job_free(job); ++ amdgpu_mn_unlock(p->mn); ++ return r; ++ } ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) + amdgpu_cs_post_dependencies(p); + #endif + +- cs->out.handle = amdgpu_ctx_add_fence(p->ctx, ring, p->fence); +- job->uf_sequence = cs->out.handle; ++ cs->out.handle = seq; ++ job->uf_sequence = seq; ++ + amdgpu_job_free_resources(job); + + trace_amdgpu_cs_ioctl(job); +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +index 49c00fb..4e8cc60 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +@@ -263,8 +263,8 @@ int amdgpu_ctx_put(struct amdgpu_ctx *ctx) + return 0; + } + +-uint64_t amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring, +- struct dma_fence *fence) ++int amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring, ++ struct dma_fence *fence, uint64_t* handler) + { + struct amdgpu_ctx_ring *cring = & ctx->rings[ring->idx]; + uint64_t seq = cring->sequence; +@@ -275,9 +275,9 @@ uint64_t amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring, + other = cring->fences[idx]; + if (other) { + signed long r; +- r = dma_fence_wait_timeout(other, false, MAX_SCHEDULE_TIMEOUT); ++ r = dma_fence_wait_timeout(other, true, MAX_SCHEDULE_TIMEOUT); + if (r < 0) +- DRM_ERROR("Error (%ld) waiting for fence!\n", r); ++ return r; + } + + dma_fence_get(fence); +@@ -288,8 +288,10 @@ uint64_t amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring, + spin_unlock(&ctx->ring_lock); + + dma_fence_put(other); ++ if (handler) ++ *handler = seq; + +- return seq; ++ return 0; + } + + struct dma_fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx, +-- +2.7.4 + |