1 files changed, 0 insertions, 98 deletions
diff --git a/common/recipes-kernel/linux/files/0266-drm-amdgpu-add-amdgpu_set_ib_value-helper-v2.patch b/common/recipes-kernel/linux/files/0266-drm-amdgpu-add-amdgpu_set_ib_value-helper-v2.patch
deleted file mode 100644
index f59f3458..00000000
--- a/common/recipes-kernel/linux/files/0266-drm-amdgpu-add-amdgpu_set_ib_value-helper-v2.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From fba087bf357fd8d9a02fef8819929b489523c2d6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Sun, 31 Jan 2016 11:00:41 +0100
-Subject: [PATCH 0266/1110] drm/amdgpu: add amdgpu_set_ib_value helper (v2)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-And use it in UVD/VCE command patching.
-
-v2: squash in Christian's fix
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h     | 10 +++++++++-
- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c |  8 ++++----
- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c |  5 ++---
- 3 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index 27c530b..a48dbe7 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -1215,11 +1215,19 @@ struct amdgpu_job {
- #define to_amdgpu_job(sched_job)		\
- 		container_of((sched_job), struct amdgpu_job, base)
- 
--static inline u32 amdgpu_get_ib_value(struct amdgpu_cs_parser *p, uint32_t ib_idx, int idx)
-+static inline u32 amdgpu_get_ib_value(struct amdgpu_cs_parser *p,
-+				      uint32_t ib_idx, int idx)
- {
- 	return p->ibs[ib_idx].ptr[idx];
- }
- 
-+static inline void amdgpu_set_ib_value(struct amdgpu_cs_parser *p,
-+				       uint32_t ib_idx, int idx,
-+				       uint32_t value)
-+{
-+	p->ibs[ib_idx].ptr[idx] = value;
-+}
-+
- /*
-  * Writeback
-  */
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
-index b4e902c..2a20b66 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
-@@ -621,7 +621,6 @@ static int amdgpu_uvd_cs_pass2(struct amdgpu_uvd_cs_ctx *ctx)
- {
- 	struct amdgpu_bo_va_mapping *mapping;
- 	struct amdgpu_bo *bo;
--	struct amdgpu_ib *ib;
- 	uint32_t cmd, lo, hi;
- 	uint64_t start, end;
- 	uint64_t addr;
-@@ -643,9 +642,10 @@ static int amdgpu_uvd_cs_pass2(struct amdgpu_uvd_cs_ctx *ctx)
- 	addr -= ((uint64_t)mapping->it.start) * AMDGPU_GPU_PAGE_SIZE;
- 	start += addr;
- 
--	ib = &ctx->parser->ibs[ctx->ib_idx];
--	ib->ptr[ctx->data0] = start & 0xFFFFFFFF;
--	ib->ptr[ctx->data1] = start >> 32;
-+	amdgpu_set_ib_value(ctx->parser, ctx->ib_idx, ctx->data0,
-+			    lower_32_bits(start));
-+	amdgpu_set_ib_value(ctx->parser, ctx->ib_idx, ctx->data1,
-+			    upper_32_bits(start));
- 
- 	cmd = amdgpu_get_ib_value(ctx->parser, ctx->ib_idx, ctx->idx) >> 1;
- 	if (cmd < 0x4) {
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
-index a96bfe1..d80e12c 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
-@@ -520,7 +520,6 @@ static int amdgpu_vce_cs_reloc(struct amdgpu_cs_parser *p, uint32_t ib_idx,
- 			       int lo, int hi, unsigned size, uint32_t index)
- {
- 	struct amdgpu_bo_va_mapping *mapping;
--	struct amdgpu_ib *ib = &p->ibs[ib_idx];
- 	struct amdgpu_bo *bo;
- 	uint64_t addr;
- 
-@@ -549,8 +548,8 @@ static int amdgpu_vce_cs_reloc(struct amdgpu_cs_parser *p, uint32_t ib_idx,
- 	addr += amdgpu_bo_gpu_offset(bo);
- 	addr -= ((uint64_t)size) * ((uint64_t)index);
- 
--	ib->ptr[lo] = addr & 0xFFFFFFFF;
--	ib->ptr[hi] = addr >> 32;
-+	amdgpu_set_ib_value(p, ib_idx, lo, lower_32_bits(addr));
-+	amdgpu_set_ib_value(p, ib_idx, hi, upper_32_bits(addr));
- 
- 	return 0;
- }
--- 
-2.7.4
-