diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0492-drm-amdgpu-remove-the-context-from-amdgpu_job.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0492-drm-amdgpu-remove-the-context-from-amdgpu_job.patch | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/common/recipes-kernel/linux/files/0492-drm-amdgpu-remove-the-context-from-amdgpu_job.patch b/common/recipes-kernel/linux/files/0492-drm-amdgpu-remove-the-context-from-amdgpu_job.patch deleted file mode 100644 index eba5bf03..00000000 --- a/common/recipes-kernel/linux/files/0492-drm-amdgpu-remove-the-context-from-amdgpu_job.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 3a185a33a2d291883bd1d0691d22901c345b12c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> -Date: Thu, 20 Aug 2015 17:35:34 +0200 -Subject: [PATCH 0492/1050] drm/amdgpu: remove the context from amdgpu_job -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Christian König <christian.koenig@amd.com> -Reviewed-by: Chunming Zhou <david1.zhou@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 -- - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +--- - drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 7 ------- - 3 files changed, 1 insertion(+), 12 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index 3c54872..0088af1 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -1046,7 +1046,6 @@ void amdgpu_ctx_fini(struct amdgpu_ctx *ctx); - - struct amdgpu_ctx *amdgpu_ctx_get(struct amdgpu_fpriv *fpriv, uint32_t id); - int amdgpu_ctx_put(struct amdgpu_ctx *ctx); --struct amdgpu_ctx *amdgpu_ctx_get_ref(struct amdgpu_ctx *ctx); - - uint64_t amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring, - struct fence *fence); -@@ -1267,7 +1266,6 @@ struct amdgpu_cs_parser { - struct amdgpu_job { - struct amd_sched_job base; - struct amdgpu_device *adev; -- struct amdgpu_ctx *ctx; - struct drm_file *owner; - struct amdgpu_ib *ibs; - uint32_t num_ibs; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -index 5d33552..780c011 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -@@ -775,7 +775,6 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev, - static int amdgpu_cs_free_job(struct amdgpu_job *sched_job) - { - int i; -- amdgpu_ctx_put(sched_job->ctx); - if (sched_job->ibs) - for (i = 0; i < sched_job->num_ibs; i++) - amdgpu_ib_free(sched_job->adev, &sched_job->ibs[i]); -@@ -849,7 +848,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) - job->ibs = parser->ibs; - job->num_ibs = parser->num_ibs; - job->owner = parser->filp; -- job->ctx = amdgpu_ctx_get_ref(parser->ctx); - mutex_init(&job->job_lock); - if (job->ibs[job->num_ibs - 1].user) { - memcpy(&job->uf, &parser->uf, -@@ -867,7 +865,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) - goto out; - } - cs->out.handle = -- amdgpu_ctx_add_fence(job->ctx, ring, -+ amdgpu_ctx_add_fence(parser->ctx, ring, - &job->base.s_fence->base); - parser->ibs[parser->num_ibs - 1].sequence = cs->out.handle; - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c -index f024eff..20cbc4e 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c -@@ -219,13 +219,6 @@ struct amdgpu_ctx *amdgpu_ctx_get(struct amdgpu_fpriv *fpriv, uint32_t id) - return ctx; - } - --struct amdgpu_ctx *amdgpu_ctx_get_ref(struct amdgpu_ctx *ctx) --{ -- if (ctx) -- kref_get(&ctx->refcount); -- return ctx; --} -- - int amdgpu_ctx_put(struct amdgpu_ctx *ctx) - { - if (ctx == NULL) --- -1.9.1 - |