diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0228-drm-amdgpu-remove-some-more-semaphore-leftovers.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0228-drm-amdgpu-remove-some-more-semaphore-leftovers.patch | 229 |
1 files changed, 0 insertions, 229 deletions
diff --git a/common/recipes-kernel/linux/files/0228-drm-amdgpu-remove-some-more-semaphore-leftovers.patch b/common/recipes-kernel/linux/files/0228-drm-amdgpu-remove-some-more-semaphore-leftovers.patch deleted file mode 100644 index f668de86..00000000 --- a/common/recipes-kernel/linux/files/0228-drm-amdgpu-remove-some-more-semaphore-leftovers.patch +++ /dev/null @@ -1,229 +0,0 @@ -From 701eab8ab9fd8fc081b5549b428163208bc01950 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Fri, 15 Jan 2016 14:33:08 -0500 -Subject: [PATCH 0228/1110] drm/amdgpu: remove some more semaphore leftovers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -No longer needed since semaphores were removed. - -Reviewed-by: Christian König <christian.koenig@amd.com> -Reviewed-by: Chunming Zhou <David1.Zhou@amd.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 -------- - drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 ---- - drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 1 - - drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 -- - drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 -- - drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 1 - - drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 1 - - drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 1 - - drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 1 - - drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 - - drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 1 - - drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 1 - - 12 files changed, 24 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index 1e9452b..f572cbc 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -84,7 +84,6 @@ extern int amdgpu_vm_fault_stop; - extern int amdgpu_vm_debug; - extern int amdgpu_sched_jobs; - extern int amdgpu_sched_hw_submission; --extern int amdgpu_enable_semaphores; - extern int amdgpu_powerplay; - extern unsigned amdgpu_pcie_gen_cap; - extern unsigned amdgpu_pcie_lane_cap; -@@ -149,7 +148,6 @@ struct amdgpu_fence; - struct amdgpu_ib; - struct amdgpu_vm; - struct amdgpu_ring; --struct amdgpu_semaphore; - struct amdgpu_cs_parser; - struct amdgpu_job; - struct amdgpu_irq_src; -@@ -294,9 +292,6 @@ struct amdgpu_ring_funcs { - struct amdgpu_ib *ib); - void (*emit_fence)(struct amdgpu_ring *ring, uint64_t addr, - uint64_t seq, unsigned flags); -- bool (*emit_semaphore)(struct amdgpu_ring *ring, -- struct amdgpu_semaphore *semaphore, -- bool emit_wait); - void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id, - uint64_t pd_addr); - void (*emit_hdp_flush)(struct amdgpu_ring *ring); -@@ -802,8 +797,6 @@ struct amdgpu_ring { - bool ready; - u32 nop; - u32 idx; -- u64 last_semaphore_signal_addr; -- u64 last_semaphore_wait_addr; - u32 me; - u32 pipe; - u32 queue; -@@ -2192,7 +2185,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) - #define amdgpu_ring_emit_ib(r, ib) (r)->funcs->emit_ib((r), (ib)) - #define amdgpu_ring_emit_vm_flush(r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr)) - #define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags)) --#define amdgpu_ring_emit_semaphore(r, semaphore, emit_wait) (r)->funcs->emit_semaphore((r), (semaphore), (emit_wait)) - #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) - #define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r)) - #define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev)) -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c -index d1f234d..66c6bbd 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c -@@ -491,10 +491,6 @@ static int amdgpu_debugfs_ring_info(struct seq_file *m, void *data) - - seq_printf(m, "driver's copy of the wptr: 0x%08x [%5d]\n", - ring->wptr, ring->wptr); -- seq_printf(m, "last semaphore signal addr : 0x%016llx\n", -- ring->last_semaphore_signal_addr); -- seq_printf(m, "last semaphore wait addr : 0x%016llx\n", -- ring->last_semaphore_wait_addr); - seq_printf(m, "%u free dwords in ring\n", ring->ring_free_dw); - seq_printf(m, "%u dwords in ring\n", count); - -diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c -index dd2a0c1..2aede8f 100644 ---- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c -+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c -@@ -1273,7 +1273,6 @@ static const struct amdgpu_ring_funcs cik_sdma_ring_funcs = { - .parse_cs = NULL, - .emit_ib = cik_sdma_ring_emit_ib, - .emit_fence = cik_sdma_ring_emit_fence, -- .emit_semaphore = NULL, - .emit_vm_flush = cik_sdma_ring_emit_vm_flush, - .emit_hdp_flush = cik_sdma_ring_emit_hdp_flush, - .test_ring = cik_sdma_ring_test_ring, -diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -index 52b3c2b..82ede2f 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -@@ -5550,7 +5550,6 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = { - .parse_cs = NULL, - .emit_ib = gfx_v7_0_ring_emit_ib_gfx, - .emit_fence = gfx_v7_0_ring_emit_fence_gfx, -- .emit_semaphore = NULL, - .emit_vm_flush = gfx_v7_0_ring_emit_vm_flush, - .emit_gds_switch = gfx_v7_0_ring_emit_gds_switch, - .emit_hdp_flush = gfx_v7_0_ring_emit_hdp_flush, -@@ -5566,7 +5565,6 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_compute = { - .parse_cs = NULL, - .emit_ib = gfx_v7_0_ring_emit_ib_compute, - .emit_fence = gfx_v7_0_ring_emit_fence_compute, -- .emit_semaphore = NULL, - .emit_vm_flush = gfx_v7_0_ring_emit_vm_flush, - .emit_gds_switch = gfx_v7_0_ring_emit_gds_switch, - .emit_hdp_flush = gfx_v7_0_ring_emit_hdp_flush, -diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -index 50e071a..95ca834 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -@@ -5108,7 +5108,6 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { - .parse_cs = NULL, - .emit_ib = gfx_v8_0_ring_emit_ib_gfx, - .emit_fence = gfx_v8_0_ring_emit_fence_gfx, -- .emit_semaphore = NULL, - .emit_vm_flush = gfx_v8_0_ring_emit_vm_flush, - .emit_gds_switch = gfx_v8_0_ring_emit_gds_switch, - .emit_hdp_flush = gfx_v8_0_ring_emit_hdp_flush, -@@ -5124,7 +5123,6 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = { - .parse_cs = NULL, - .emit_ib = gfx_v8_0_ring_emit_ib_compute, - .emit_fence = gfx_v8_0_ring_emit_fence_compute, -- .emit_semaphore = NULL, - .emit_vm_flush = gfx_v8_0_ring_emit_vm_flush, - .emit_gds_switch = gfx_v8_0_ring_emit_gds_switch, - .emit_hdp_flush = gfx_v8_0_ring_emit_hdp_flush, -diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c -index 1eae05a..77d5f29 100644 ---- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c -+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c -@@ -1277,7 +1277,6 @@ static const struct amdgpu_ring_funcs sdma_v2_4_ring_funcs = { - .parse_cs = NULL, - .emit_ib = sdma_v2_4_ring_emit_ib, - .emit_fence = sdma_v2_4_ring_emit_fence, -- .emit_semaphore = NULL, - .emit_vm_flush = sdma_v2_4_ring_emit_vm_flush, - .emit_hdp_flush = sdma_v2_4_ring_emit_hdp_flush, - .test_ring = sdma_v2_4_ring_test_ring, -diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c -index 93930ae..d6170e6 100644 ---- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c -@@ -1544,7 +1544,6 @@ static const struct amdgpu_ring_funcs sdma_v3_0_ring_funcs = { - .parse_cs = NULL, - .emit_ib = sdma_v3_0_ring_emit_ib, - .emit_fence = sdma_v3_0_ring_emit_fence, -- .emit_semaphore = NULL, - .emit_vm_flush = sdma_v3_0_ring_emit_vm_flush, - .emit_hdp_flush = sdma_v3_0_ring_emit_hdp_flush, - .test_ring = sdma_v3_0_ring_test_ring, -diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c -index 65961e4..fcc29c6 100644 ---- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c -+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c -@@ -861,7 +861,6 @@ static const struct amdgpu_ring_funcs uvd_v4_2_ring_funcs = { - .parse_cs = amdgpu_uvd_ring_parse_cs, - .emit_ib = uvd_v4_2_ring_emit_ib, - .emit_fence = uvd_v4_2_ring_emit_fence, -- .emit_semaphore = NULL, - .test_ring = uvd_v4_2_ring_test_ring, - .test_ib = uvd_v4_2_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, -diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c -index 2a4a21a..67be97c 100644 ---- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c -@@ -802,7 +802,6 @@ static const struct amdgpu_ring_funcs uvd_v5_0_ring_funcs = { - .parse_cs = amdgpu_uvd_ring_parse_cs, - .emit_ib = uvd_v5_0_ring_emit_ib, - .emit_fence = uvd_v5_0_ring_emit_fence, -- .emit_semaphore = NULL, - .test_ring = uvd_v5_0_ring_test_ring, - .test_ib = uvd_v5_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, -diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c -index dc59a53..4d64769 100644 ---- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c -@@ -1038,7 +1038,6 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_funcs = { - .parse_cs = amdgpu_uvd_ring_parse_cs, - .emit_ib = uvd_v6_0_ring_emit_ib, - .emit_fence = uvd_v6_0_ring_emit_fence, -- .emit_semaphore = NULL, - .test_ring = uvd_v6_0_ring_test_ring, - .test_ib = uvd_v6_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, -diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c -index 6e48cc6..a4bfee2 100644 ---- a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c -@@ -642,7 +642,6 @@ static const struct amdgpu_ring_funcs vce_v2_0_ring_funcs = { - .parse_cs = amdgpu_vce_ring_parse_cs, - .emit_ib = amdgpu_vce_ring_emit_ib, - .emit_fence = amdgpu_vce_ring_emit_fence, -- .emit_semaphore = NULL, - .test_ring = amdgpu_vce_ring_test_ring, - .test_ib = amdgpu_vce_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, -diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c -index e3b47bc..c438c7e 100644 ---- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c -@@ -762,7 +762,6 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_funcs = { - .parse_cs = amdgpu_vce_ring_parse_cs, - .emit_ib = amdgpu_vce_ring_emit_ib, - .emit_fence = amdgpu_vce_ring_emit_fence, -- .emit_semaphore = NULL, - .test_ring = amdgpu_vce_ring_test_ring, - .test_ib = amdgpu_vce_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, --- -2.7.4 - |