1 files changed, 0 insertions, 131 deletions
diff --git a/common/recipes-kernel/linux/files/0496-drm-amdgpu-add-owner-for-sched-fence.patch b/common/recipes-kernel/linux/files/0496-drm-amdgpu-add-owner-for-sched-fence.patch
deleted file mode 100644
index 19c1e650..00000000
--- a/common/recipes-kernel/linux/files/0496-drm-amdgpu-add-owner-for-sched-fence.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 84f76ea6b03a766931e5d6d650af5ab980c6c4f4 Mon Sep 17 00:00:00 2001
-From: Chunming Zhou <david1.zhou@amd.com>
-Date: Mon, 24 Aug 2015 12:47:36 +0800
-Subject: [PATCH 0496/1050] drm/amdgpu: add owner for sched fence
-
-Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
-Reviewed-by: Christian K?nig <christian.koenig@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h           | 1 -
- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c        | 2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c     | 4 ++--
- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 3 ++-
- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 4 +++-
- drivers/gpu/drm/amd/scheduler/sched_fence.c   | 4 ++--
- 6 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index a2d5cf7..19a8cbe 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -1264,7 +1264,6 @@ struct amdgpu_cs_parser {
- struct amdgpu_job {
- 	struct amd_sched_job    base;
- 	struct amdgpu_device	*adev;
--	struct drm_file		*owner;
- 	struct amdgpu_ib	*ibs;
- 	uint32_t		num_ibs;
- 	struct mutex            job_lock;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-index 82e1432..6a206f1 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-@@ -847,7 +847,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
- 		job->adev = parser->adev;
- 		job->ibs = parser->ibs;
- 		job->num_ibs = parser->num_ibs;
--		job->owner = parser->filp;
-+		job->base.owner = parser->filp;
- 		mutex_init(&job->job_lock);
- 		if (job->ibs[job->num_ibs - 1].user) {
- 			memcpy(&job->uf,  &parser->uf,
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-index 1aa72ed..4f5c087 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-@@ -44,7 +44,7 @@ static struct fence *amdgpu_sched_run_job(struct amd_gpu_scheduler *sched,
- 	r = amdgpu_ib_schedule(sched_job->adev,
- 			       sched_job->num_ibs,
- 			       sched_job->ibs,
--			       sched_job->owner);
-+			       sched_job->base.owner);
- 	if (r)
- 		goto err;
- 	fence = amdgpu_fence_ref(sched_job->ibs[sched_job->num_ibs - 1].fence);
-@@ -101,7 +101,7 @@ int amdgpu_sched_ib_submit_kernel_helper(struct amdgpu_device *adev,
- 		job->adev = adev;
- 		job->ibs = ibs;
- 		job->num_ibs = num_ibs;
--		job->owner = owner;
-+		job->base.owner = owner;
- 		mutex_init(&job->job_lock);
- 		job->free_job = free_job;
- 		mutex_lock(&job->job_lock);
-diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
-index d747f82..24593fd 100644
---- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
-+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
-@@ -232,7 +232,8 @@ static bool amd_sched_entity_in(struct amd_sched_job *job)
- int amd_sched_entity_push_job(struct amd_sched_job *sched_job)
- {
- 	struct amd_sched_entity *entity = sched_job->s_entity;
--	struct amd_sched_fence *fence = amd_sched_fence_create(entity);
-+	struct amd_sched_fence *fence = amd_sched_fence_create(
-+		entity, sched_job->owner);
- 	int r;
- 
- 	if (!fence)
-diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
-index 62655f4..0927864 100644
---- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
-+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
-@@ -65,6 +65,7 @@ struct amd_sched_fence {
- 	struct fence                    base;
- 	struct amd_gpu_scheduler	*scheduler;
- 	spinlock_t			lock;
-+	void                            *owner;
- };
- 
- struct amd_sched_job {
-@@ -72,6 +73,7 @@ struct amd_sched_job {
- 	struct amd_gpu_scheduler        *sched;
- 	struct amd_sched_entity         *s_entity;
- 	struct amd_sched_fence          *s_fence;
-+	void		                *owner;
- };
- 
- extern const struct fence_ops amd_sched_fence_ops;
-@@ -126,7 +128,7 @@ int amd_sched_entity_fini(struct amd_gpu_scheduler *sched,
- int amd_sched_entity_push_job(struct amd_sched_job *sched_job);
- 
- struct amd_sched_fence *amd_sched_fence_create(
--	struct amd_sched_entity *s_entity);
-+	struct amd_sched_entity *s_entity, void *owner);
- void amd_sched_fence_signal(struct amd_sched_fence *fence);
- 
- 
-diff --git a/drivers/gpu/drm/amd/scheduler/sched_fence.c b/drivers/gpu/drm/amd/scheduler/sched_fence.c
-index 7f0f578..e62c379 100644
---- a/drivers/gpu/drm/amd/scheduler/sched_fence.c
-+++ b/drivers/gpu/drm/amd/scheduler/sched_fence.c
-@@ -27,7 +27,7 @@
- #include <drm/drmP.h>
- #include "gpu_scheduler.h"
- 
--struct amd_sched_fence *amd_sched_fence_create(struct amd_sched_entity *s_entity)
-+struct amd_sched_fence *amd_sched_fence_create(struct amd_sched_entity *s_entity, void *owner)
- {
- 	struct amd_sched_fence *fence = NULL;
- 	unsigned seq;
-@@ -35,7 +35,7 @@ struct amd_sched_fence *amd_sched_fence_create(struct amd_sched_entity *s_entity
- 	fence = kzalloc(sizeof(struct amd_sched_fence), GFP_KERNEL);
- 	if (fence == NULL)
- 		return NULL;
--
-+	fence->owner = owner;
- 	fence->scheduler = s_entity->scheduler;
- 	spin_lock_init(&fence->lock);
- 
--- 
-1.9.1
-