diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/1475-drm-amdgpu-split-pipeline-sync-and-vm-flush.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/1475-drm-amdgpu-split-pipeline-sync-and-vm-flush.patch | 173 |
1 files changed, 0 insertions, 173 deletions
diff --git a/common/recipes-kernel/linux/files/1475-drm-amdgpu-split-pipeline-sync-and-vm-flush.patch b/common/recipes-kernel/linux/files/1475-drm-amdgpu-split-pipeline-sync-and-vm-flush.patch deleted file mode 100644 index 0eb8bfdf..00000000 --- a/common/recipes-kernel/linux/files/1475-drm-amdgpu-split-pipeline-sync-and-vm-flush.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 9887d1c644fe220700aa8c98eb2759cdeeb8001c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> -Date: Tue, 1 Mar 2016 15:42:52 +0100 -Subject: [PATCH 1475/1565] drm/amdgpu: split pipeline sync and vm flush -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows us to use the pipeline sync for other tasks as well. - -Signed-off-by: Christian König <christian.koenig@amd.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Reviewed-by: Chunming Zhou <david1.zhou@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 ++ - drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 37 ++++++++++++++++++++++++---------- - drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 11 ++++++++-- - 4 files changed, 39 insertions(+), 13 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index f36beee..37423fe 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -289,6 +289,7 @@ struct amdgpu_ring_funcs { - struct amdgpu_ib *ib); - void (*emit_fence)(struct amdgpu_ring *ring, uint64_t addr, - uint64_t seq, unsigned flags); -+ void (*emit_pipeline_sync)(struct amdgpu_ring *ring); - void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id, - uint64_t pd_addr); - void (*emit_hdp_flush)(struct amdgpu_ring *ring); -@@ -2200,6 +2201,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) - #define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r)) - #define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r)) - #define amdgpu_ring_emit_ib(r, ib) (r)->funcs->emit_ib((r), (ib)) -+#define amdgpu_ring_emit_pipeline_sync(r) (r)->funcs->emit_pipeline_sync((r)) - #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_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -index 8642a1c..9a9abba 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -@@ -257,6 +257,8 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, - - if (pd_addr != AMDGPU_VM_NO_FLUSH) { - trace_amdgpu_vm_flush(pd_addr, ring->idx, vm_id); -+ if (ring->funcs->emit_pipeline_sync) -+ amdgpu_ring_emit_pipeline_sync(ring); - amdgpu_ring_emit_vm_flush(ring, vm_id, pd_addr); - } - -diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -index 1e18b49..cdfdd74 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -@@ -3041,22 +3041,15 @@ static int gfx_v7_0_cp_resume(struct amdgpu_device *adev) - return 0; - } - --/* -- * vm -- * VMID 0 is the physical GPU addresses as used by the kernel. -- * VMIDs 1-15 are used for userspace clients and are handled -- * by the amdgpu vm/hsa code. -- */ - /** - * gfx_v7_0_ring_emit_vm_flush - cik vm flush using the CP - * -- * @adev: amdgpu_device pointer -+ * @ring: the ring to emmit the commands to - * -- * Update the page table base and flush the VM TLB -- * using the CP (CIK). -+ * Sync the command pipeline with the PFP. E.g. wait for everything -+ * to be completed. - */ --static void gfx_v7_0_ring_emit_vm_flush(struct amdgpu_ring *ring, -- unsigned vm_id, uint64_t pd_addr) -+static void gfx_v7_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring) - { - int usepfp = (ring->type == AMDGPU_RING_TYPE_GFX); - uint32_t seq = ring->fence_drv.sync_seq; -@@ -3079,6 +3072,26 @@ static void gfx_v7_0_ring_emit_vm_flush(struct amdgpu_ring *ring, - amdgpu_ring_write(ring, PACKET3(PACKET3_SWITCH_BUFFER, 0)); - amdgpu_ring_write(ring, 0); - } -+} -+ -+/* -+ * vm -+ * VMID 0 is the physical GPU addresses as used by the kernel. -+ * VMIDs 1-15 are used for userspace clients and are handled -+ * by the amdgpu vm/hsa code. -+ */ -+/** -+ * gfx_v7_0_ring_emit_vm_flush - cik vm flush using the CP -+ * -+ * @adev: amdgpu_device pointer -+ * -+ * Update the page table base and flush the VM TLB -+ * using the CP (CIK). -+ */ -+static void gfx_v7_0_ring_emit_vm_flush(struct amdgpu_ring *ring, -+ unsigned vm_id, uint64_t pd_addr) -+{ -+ int usepfp = (ring->type == AMDGPU_RING_TYPE_GFX); - - amdgpu_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3)); - amdgpu_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) | -@@ -5160,6 +5173,7 @@ 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_pipeline_sync = gfx_v7_0_ring_emit_pipeline_sync, - .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, -@@ -5177,6 +5191,7 @@ 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_pipeline_sync = gfx_v7_0_ring_emit_pipeline_sync, - .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 fdb0744..509d0ba 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -@@ -4692,8 +4692,7 @@ static void gfx_v8_0_ring_emit_fence_gfx(struct amdgpu_ring *ring, u64 addr, - - } - --static void gfx_v8_0_ring_emit_vm_flush(struct amdgpu_ring *ring, -- unsigned vm_id, uint64_t pd_addr) -+static void gfx_v8_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring) - { - int usepfp = (ring->type == AMDGPU_RING_TYPE_GFX); - uint32_t seq = ring->fence_drv.sync_seq; -@@ -4716,6 +4715,12 @@ static void gfx_v8_0_ring_emit_vm_flush(struct amdgpu_ring *ring, - amdgpu_ring_write(ring, PACKET3(PACKET3_SWITCH_BUFFER, 0)); - amdgpu_ring_write(ring, 0); - } -+} -+ -+static void gfx_v8_0_ring_emit_vm_flush(struct amdgpu_ring *ring, -+ unsigned vm_id, uint64_t pd_addr) -+{ -+ int usepfp = (ring->type == AMDGPU_RING_TYPE_GFX); - - amdgpu_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3)); - amdgpu_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) | -@@ -5038,6 +5043,7 @@ 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_pipeline_sync = gfx_v8_0_ring_emit_pipeline_sync, - .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, -@@ -5055,6 +5061,7 @@ 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_pipeline_sync = gfx_v8_0_ring_emit_pipeline_sync, - .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, --- -1.9.1 - |