drm/amdgpu: fix vcn_v1_0_dec_ring_emit_wreg
Subsystems (4)
PATCH 1/13 drm/amdgpu: fix vcn_v1_0_dec_ring_emit_wreg
That got mixed up with the encode ring function.
--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +18 -1
@@ -880,6 +880,22 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring,vcn_v1_0_dec_vm_reg_wait (ring, data0, data1, mask); } +static void vcn_v1_0_dec_ring_emit_wreg (struct amdgpu_ring *ring, +uint32_t reg,uint32_t val) +{ +struct amdgpu_device *adev = ring->adev; + +amdgpu_ring_write (ring, +PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA0),0 )); +amdgpu_ring_write (ring, reg <<2 ); +amdgpu_ring_write (ring, +PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA1),0 )); +amdgpu_ring_write (ring, val); +amdgpu_ring_write (ring, +PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_CMD),0 )); +amdgpu_ring_write (ring,VCN_DEC_CMD_WRITE_REG <<1 ); +} +/** * vcn_v1_0_enc_ring_get_rptr - get enc read pointer *
@@ -1097,7 +1113,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .pad_ib = amdgpu_ring_generic_pad_ib, .begin_use = amdgpu_vcn_ring_begin_use, .end_use = amdgpu_vcn_ring_end_use, - .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, + .emit_wreg = vcn_v1_0_dec_ring_emit_wreg, };static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = {
@@ -1124,6 +1140,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { .pad_ib = amdgpu_ring_generic_pad_ib, .begin_use = amdgpu_vcn_ring_begin_use, .end_use = amdgpu_vcn_ring_end_use, + .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, };static void vcn_v1_0_set_dec_ring_funcs (struct amdgpu_device *adev)
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180126201326.8829-1-christian.koenig-5C7GfCeVMHo@public.gmane.org
PATCH 2/13 drm/amdgpu: drop root shadow sync
Completely pointless, it is the same reservation object as the root PD anyway.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -5
@@ -956,11 +956,6 @@ int amdgpu_vm_update_directories(struct amdgpu_device *adev,amdgpu_ring_pad_ib (ring, params.ib);amdgpu_sync_resv (adev, &job->sync, root->tbo.resv,AMDGPU_FENCE_OWNER_VM , false); -if (root->shadow) -amdgpu_sync_resv (adev, &job->sync, - root->shadow->tbo.resv, -AMDGPU_FENCE_OWNER_VM , false); -WARN_ON (params.ib->length_dw > ndw); r =amdgpu_job_submit (job, ring, &vm->entity,AMDGPU_FENCE_OWNER_VM , &fence);
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180126201326.8829-2-christian.koenig-5C7GfCeVMHo@public.gmane.org
He, Roger
Reviewed-by Roger HeRE: [PATCH 02/13] drm/amdgpu: drop root shadow sync
Thanks
Roger(Hongbo.He)
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian K?nig
Sent: Saturday, January 27, 2018 4:13 AM
To: [email protected]
Subject: [PATCH 02/13] drm/amdgpu: drop root shadow sync
Completely pointless, it is the same reservation object as the root PD anyway.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -5
@@ -956,11 +956,6 @@ int amdgpu_vm_update_directories(struct amdgpu_device *adev,amdgpu_ring_pad_ib (ring, params.ib);amdgpu_sync_resv (adev, &job->sync, root->tbo.resv,AMDGPU_FENCE_OWNER_VM , false); -if (root->shadow) -amdgpu_sync_resv (adev, &job->sync, - root->shadow->tbo.resv, -AMDGPU_FENCE_OWNER_VM , false); -WARN_ON (params.ib->length_dw > ndw); r =amdgpu_job_submit (job, ring, &vm->entity,AMDGPU_FENCE_OWNER_VM , &fence);
--
2.14.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/13 drm/amdgpu: add new emit_reg_wait callback
In reply to a message not in the archiveAllows us to wait for a register value/mask on a ring.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 ++ 2 files changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1796,6 +1796,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)#define amdgpu_ring_emit_cntxcntl (r, d) (r)->funcs->emit_cntxcntl((r), (d))#define amdgpu_ring_emit_rreg (r, d) (r)->funcs->emit_rreg((r), (d))#define amdgpu_ring_emit_wreg (r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) +#define amdgpu_ring_emit_reg_wait (r, d, v, m) (r)->funcs->emit_reg_wait((r), (d), (v), (m))#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b))#define amdgpu_ring_pad_ib (r, ib) ((r)->funcs->pad_ib((r), (ib)))#define amdgpu_ring_init_cond_exec (r) (r)->funcs->init_cond_exec((r))
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +2 -0
@@ -150,6 +150,8 @@ struct amdgpu_ring_funcs {void (*emit_cntxcntl) (struct amdgpu_ring *ring,uint32_t flags);void (*emit_rreg)(struct amdgpu_ring *ring,uint32_t reg);void (*emit_wreg)(struct amdgpu_ring *ring,uint32_t reg,uint32_t val); +void (*emit_reg_wait)(struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask);void (*emit_tmz)(struct amdgpu_ring *ring,bool start);/* priority functions */ void (*set_priority) (struct amdgpu_ring *ring,
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/13 drm/amdgpu: add gfx_v9_0_ring_emit_reg_wait implementation
In reply to a message not in the archiveImplement emit_reg_wait for gfx v9.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +9 -0
@@ -4003,6 +4003,12 @@ static void gfx_v9_0_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,amdgpu_ring_write (ring, val); } +static void gfx_v9_0_ring_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask) +{ +gfx_v9_0_wait_reg_mem (ring,0 ,0 ,0 , reg,0 , val, mask,0x20 ); +} +static void gfx_v9_0_set_gfx_eop_interrupt_state (struct amdgpu_device *adev,enum amdgpu_interrupt_state state) {
@@ -4321,6 +4327,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec, .emit_tmz = gfx_v9_0_ring_emit_tmz, .emit_wreg = gfx_v9_0_ring_emit_wreg, + .emit_reg_wait = gfx_v9_0_ring_emit_reg_wait, };static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = {
@@ -4352,6 +4359,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = { .pad_ib = amdgpu_ring_generic_pad_ib, .set_priority = gfx_v9_0_ring_set_priority_compute, .emit_wreg = gfx_v9_0_ring_emit_wreg, + .emit_reg_wait = gfx_v9_0_ring_emit_reg_wait, };static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = {
@@ -4379,6 +4387,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = { .pad_ib = amdgpu_ring_generic_pad_ib, .emit_rreg = gfx_v9_0_ring_emit_rreg, .emit_wreg = gfx_v9_0_ring_emit_wreg, + .emit_reg_wait = gfx_v9_0_ring_emit_reg_wait, };static void gfx_v9_0_set_ring_funcs (struct amdgpu_device *adev)
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/13 drm/amdgpu: implement sdma_v4_0_ring_emit_reg_wait
In reply to a message not in the archiveAdd emit_reg_wait implementation for SDMA v4.
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +15 -0
@@ -1152,6 +1152,20 @@ static void sdma_v4_0_ring_emit_wreg(struct amdgpu_ring *ring,amdgpu_ring_write (ring, val); } +static void sdma_v4_0_ring_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask) +{ +amdgpu_ring_write (ring,SDMA_PKT_HEADER_OP (SDMA_OP_POLL_REGMEM ) | +SDMA_PKT_POLL_REGMEM_HEADER_HDP_FLUSH (0 ) | +SDMA_PKT_POLL_REGMEM_HEADER_FUNC (3 ));/* equal */ +amdgpu_ring_write (ring, reg <<2 ); +amdgpu_ring_write (ring,0 ); +amdgpu_ring_write (ring, val);/* reference */ +amdgpu_ring_write (ring, mask);/* mask */ +amdgpu_ring_write (ring,SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT (0xfff ) | +SDMA_PKT_POLL_REGMEM_DW5_INTERVAL (10 )); +} +static int sdma_v4_0_early_init (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -1588,6 +1602,7 @@ static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = { .insert_nop = sdma_v4_0_ring_insert_nop, .pad_ib = sdma_v4_0_ring_pad_ib, .emit_wreg = sdma_v4_0_ring_emit_wreg, + .emit_reg_wait = sdma_v4_0_ring_emit_reg_wait, };static void sdma_v4_0_set_ring_funcs (struct amdgpu_device *adev)
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/13 drm/amdgpu: implement uvd_v7_0_(enc_|)ring_emit_reg_wait
In reply to a message not in the archiveAdd emit_reg_wait implementation for UVD v7.
--- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 40 +++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +24 -16
@@ -1241,17 +1241,17 @@ static void uvd_v7_0_ring_emit_wreg(struct amdgpu_ring *ring,amdgpu_ring_write (ring,8 ); } -static void uvd_v7_0_vm_reg_wait (struct amdgpu_ring *ring, -uint32_t data0,uint32_t data1,uint32_t mask) +static void uvd_v7_0_ring_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask) {struct amdgpu_device *adev = ring->adev;amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA0),0 )); -amdgpu_ring_write (ring, data0); +amdgpu_ring_write (ring, reg <<2 );amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA1),0 )); -amdgpu_ring_write (ring, data1); +amdgpu_ring_write (ring, val);amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GP_SCRATCH8),0 ));amdgpu_ring_write (ring, mask);
@@ -1271,16 +1271,16 @@ static void uvd_v7_0_ring_emit_vm_flush(struct amdgpu_ring *ring, pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);/* wait for reg writes */ - data0 = (hub->ctx0_ptb_addr_lo32 + vmid *2 ) <<2 ; + data0 = hub->ctx0_ptb_addr_lo32 + vmid *2 ; data1 =lower_32_bits (pd_addr); mask =0xffffffff ; -uvd_v7_0_vm_reg_wait (ring, data0, data1, mask); +uvd_v7_0_ring_emit_reg_wait (ring, data0, data1, mask);/* wait for flush */ - data0 = (hub->vm_inv_eng0_ack + eng) <<2 ; + data0 = hub->vm_inv_eng0_ack + eng; data1 =1 << vmid; mask =1 << vmid; -uvd_v7_0_vm_reg_wait (ring, data0, data1, mask); +uvd_v7_0_ring_emit_reg_wait (ring, data0, data1, mask); }static void uvd_v7_0_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count)
@@ -1308,16 +1308,12 @@ static void uvd_v7_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);/* wait for reg writes */ -amdgpu_ring_write (ring,HEVC_ENC_CMD_REG_WAIT ); -amdgpu_ring_write (ring, (hub->ctx0_ptb_addr_lo32 + vmid *2 ) <<2 ); -amdgpu_ring_write (ring,0xffffffff ); -amdgpu_ring_write (ring,lower_32_bits (pd_addr)); +amdgpu_ring_emit_reg_wait (ring, hub->ctx0_ptb_addr_lo32 + vmid *2 , +lower_32_bits (pd_addr),0xffffffff );/* wait for flush */ -amdgpu_ring_write (ring,HEVC_ENC_CMD_REG_WAIT ); -amdgpu_ring_write (ring, (hub->vm_inv_eng0_ack + eng) <<2 ); -amdgpu_ring_write (ring,1 << vmid); -amdgpu_ring_write (ring,1 << vmid); +amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_ack + eng, +1 << vmid,1 << vmid); } static void uvd_v7_0_enc_ring_emit_wreg(struct amdgpu_ring *ring,
@@ -1328,6 +1324,16 @@ static void uvd_v7_0_enc_ring_emit_wreg(struct amdgpu_ring *ring,amdgpu_ring_write (ring, val); } +static void uvd_v7_0_enc_ring_emit_reg_wait (struct amdgpu_ring *ring, +uint32_t reg,uint32_t val, +uint32_t mask) +{ +amdgpu_ring_write (ring,HEVC_ENC_CMD_REG_WAIT ); +amdgpu_ring_write (ring, reg <<2 ); +amdgpu_ring_write (ring, mask); +amdgpu_ring_write (ring, val); +} +#if 0 static bool uvd_v7_0_is_idle (void *handle) {
@@ -1676,6 +1682,7 @@ static const struct amdgpu_ring_funcs uvd_v7_0_ring_vm_funcs = { .begin_use = amdgpu_uvd_ring_begin_use, .end_use = amdgpu_uvd_ring_end_use, .emit_wreg = uvd_v7_0_ring_emit_wreg, + .emit_reg_wait = uvd_v7_0_ring_emit_reg_wait, };static const struct amdgpu_ring_funcs uvd_v7_0_enc_ring_vm_funcs = {
@@ -1704,6 +1711,7 @@ static const struct amdgpu_ring_funcs uvd_v7_0_enc_ring_vm_funcs = { .begin_use = amdgpu_uvd_ring_begin_use, .end_use = amdgpu_uvd_ring_end_use, .emit_wreg = uvd_v7_0_enc_ring_emit_wreg, + .emit_reg_wait = uvd_v7_0_enc_ring_emit_reg_wait, };static void uvd_v7_0_set_ring_funcs (struct amdgpu_device *adev)
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180126201326.8829-6-christian.koenig-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 06/13] drm/amdgpu: implement uvd_v7_0_(enc_|)ring_emit_reg_wait
Suggestion inline ...
Quoted 55 lines · Christian König
Add
emit_reg_waitimplementation for UVD v7.Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 40 +++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +8
-8@@ -1241,17 +1241,17 @@ static void uvd_v7_0_ring_emit_wreg(struct amdgpu_ring *ring,amdgpu_ring_write (ring,8 ); } -static void uvd_v7_0_vm_reg_wait (struct amdgpu_ring *ring, -uint32_t data0,uint32_t data1,uint32_t mask) +static void uvd_v7_0_ring_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask) {struct amdgpu_device *adev = ring->adev;amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA0),0 )); -amdgpu_ring_write (ring, data0); +amdgpu_ring_write (ring, reg <<2 );amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA1),0 )); -amdgpu_ring_write (ring, data1); +amdgpu_ring_write (ring, val);amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GP_SCRATCH8),0 ));amdgpu_ring_write (ring, mask);@@ -1271,16 +1271,16 @@ static void uvd_v7_0_ring_emit_vm_flush(struct amdgpu_ring *ring, pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);/* wait for reg writes */ - data0 = (hub->ctx0_ptb_addr_lo32 + vmid *2 ) <<2 ; + data0 = hub->ctx0_ptb_addr_lo32 + vmid *2 ; data1 =lower_32_bits (pd_addr); mask =0xffffffff ; -uvd_v7_0_vm_reg_wait (ring, data0, data1, mask); +uvd_v7_0_ring_emit_reg_wait (ring, data0, data1, mask);/* wait for flush */ - data0 = (hub->vm_inv_eng0_ack + eng) <<2 ; + data0 = hub->vm_inv_eng0_ack + eng; data1 =1 << vmid; mask =1 << vmid; -uvd_v7_0_vm_reg_wait (ring, data0, data1, mask); +uvd_v7_0_ring_emit_reg_wait (ring, data0, data1, mask); }static void uvd_v7_0_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count)
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c static void uvd_v7_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, · line 1312
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +2
-4@@ -1308,16 +1308,12 @@ static void uvd_v7_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);/* wait for reg writes */ -amdgpu_ring_write (ring,HEVC_ENC_CMD_REG_WAIT ); -amdgpu_ring_write (ring, (hub->ctx0_ptb_addr_lo32 + vmid *2 ) <<2 ); -amdgpu_ring_write (ring,0xffffffff ); -amdgpu_ring_write (ring,lower_32_bits (pd_addr)); +amdgpu_ring_emit_reg_wait (ring, hub->ctx0_ptb_addr_lo32 + vmid *2 , +lower_32_bits (pd_addr),0xffffffff );
You could call uvd_v7_0_ring_emit_reg_wait directly here and save yourself an indirect call. It would also allow the compiler to inline it if appropriate.
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c static void uvd_v7_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, · line 1316
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +2
-4/* wait for flush */ -amdgpu_ring_write (ring,HEVC_ENC_CMD_REG_WAIT ); -amdgpu_ring_write (ring, (hub->vm_inv_eng0_ack + eng) <<2 ); -amdgpu_ring_write (ring,1 << vmid); -amdgpu_ring_write (ring,1 << vmid); +amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_ack + eng, +1 << vmid,1 << vmid);
Same as above.
Regards,
Felix
Quoted 29 lines
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +11
-0} static void uvd_v7_0_enc_ring_emit_wreg(struct amdgpu_ring *ring,@@ -1328,6 +1324,16 @@ static void uvd_v7_0_enc_ring_emit_wreg(struct amdgpu_ring *ring,amdgpu_ring_write (ring, val); } +static void uvd_v7_0_enc_ring_emit_reg_wait (struct amdgpu_ring *ring, +uint32_t reg,uint32_t val, +uint32_t mask) +{ +amdgpu_ring_write (ring,HEVC_ENC_CMD_REG_WAIT ); +amdgpu_ring_write (ring, reg <<2 ); +amdgpu_ring_write (ring, mask); +amdgpu_ring_write (ring, val); +} +#if 0 static bool uvd_v7_0_is_idle (void *handle) {@@ -1676,6 +1682,7 @@ static const struct amdgpu_ring_funcs uvd_v7_0_ring_vm_funcs = { .begin_use = amdgpu_uvd_ring_begin_use, .end_use = amdgpu_uvd_ring_end_use, .emit_wreg = uvd_v7_0_ring_emit_wreg, + .emit_reg_wait = uvd_v7_0_ring_emit_reg_wait, };static const struct amdgpu_ring_funcs uvd_v7_0_enc_ring_vm_funcs = {
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c static const struct amdgpu_ring_funcs uvd_v7_0_enc_ring_vm_funcs = { · line 1717
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +1
-0@@ -1704,6 +1711,7 @@ static const struct amdgpu_ring_funcs uvd_v7_0_enc_ring_vm_funcs = { .begin_use = amdgpu_uvd_ring_begin_use, .end_use = amdgpu_uvd_ring_end_use, .emit_wreg = uvd_v7_0_enc_ring_emit_wreg, + .emit_reg_wait = uvd_v7_0_enc_ring_emit_reg_wait, };static void uvd_v7_0_set_ring_funcs (struct amdgpu_device *adev)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/13 drm/amdgpu: implement vce_v4_0_emit_reg_wait
In reply to a message not in the archiveAdd emit_reg_wait implementation for VCE v4.
--- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +14 -8
@@ -975,16 +975,12 @@ static void vce_v4_0_emit_vm_flush(struct amdgpu_ring *ring, pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);/* wait for reg writes */ -amdgpu_ring_write (ring,VCE_CMD_REG_WAIT ); -amdgpu_ring_write (ring, (hub->ctx0_ptb_addr_lo32 + vmid *2 ) <<2 ); -amdgpu_ring_write (ring,0xffffffff ); -amdgpu_ring_write (ring,lower_32_bits (pd_addr)); +amdgpu_ring_emit_reg_wait (ring, hub->ctx0_ptb_addr_lo32 + vmid *2 , +lower_32_bits (pd_addr),0xffffffff );/* wait for flush */ -amdgpu_ring_write (ring,VCE_CMD_REG_WAIT ); -amdgpu_ring_write (ring, (hub->vm_inv_eng0_ack + eng) <<2 ); -amdgpu_ring_write (ring,1 << vmid); -amdgpu_ring_write (ring,1 << vmid); +amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_ack + eng, +1 << vmid,1 << vmid); } static void vce_v4_0_emit_wreg(struct amdgpu_ring *ring,
@@ -995,6 +991,15 @@ static void vce_v4_0_emit_wreg(struct amdgpu_ring *ring,amdgpu_ring_write (ring, val); } +static void vce_v4_0_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask) +{ +amdgpu_ring_write (ring,VCE_CMD_REG_WAIT ); +amdgpu_ring_write (ring, reg <<2 ); +amdgpu_ring_write (ring, mask); +amdgpu_ring_write (ring, val); +} + static int vce_v4_0_set_interrupt_state(struct amdgpu_device *adev, struct amdgpu_irq_src *source, unsigned type,
@@ -1079,6 +1084,7 @@ static const struct amdgpu_ring_funcs vce_v4_0_ring_vm_funcs = { .begin_use = amdgpu_vce_ring_begin_use, .end_use = amdgpu_vce_ring_end_use, .emit_wreg = vce_v4_0_emit_wreg, + .emit_reg_wait = vce_v4_0_emit_reg_wait, };static void vce_v4_0_set_ring_funcs (struct amdgpu_device *adev)
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180126201326.8829-7-christian.koenig-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 07/13] drm/amdgpu: implement vce_v4_0_emit_reg_wait
Suggestion inline ...
Quoted 12 lines · Christian König
Add
emit_reg_waitimplementation for VCE v4.Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c static void vce_v4_0_emit_vm_flush(struct amdgpu_ring *ring, · line 979
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +2
-4@@ -975,16 +975,12 @@ static void vce_v4_0_emit_vm_flush(struct amdgpu_ring *ring, pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);/* wait for reg writes */ -amdgpu_ring_write (ring,VCE_CMD_REG_WAIT ); -amdgpu_ring_write (ring, (hub->ctx0_ptb_addr_lo32 + vmid *2 ) <<2 ); -amdgpu_ring_write (ring,0xffffffff ); -amdgpu_ring_write (ring,lower_32_bits (pd_addr)); +amdgpu_ring_emit_reg_wait (ring, hub->ctx0_ptb_addr_lo32 + vmid *2 , +lower_32_bits (pd_addr),0xffffffff );
Call vce_v4_0_emit_reg_wait directly.
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c static void vce_v4_0_emit_vm_flush(struct amdgpu_ring *ring, · line 983
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +2
-4/* wait for flush */ -amdgpu_ring_write (ring,VCE_CMD_REG_WAIT ); -amdgpu_ring_write (ring, (hub->vm_inv_eng0_ack + eng) <<2 ); -amdgpu_ring_write (ring,1 << vmid); -amdgpu_ring_write (ring,1 << vmid); +amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_ack + eng, +1 << vmid,1 << vmid);
Same as above.
Regards,
Felix
Quoted 20 lines
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +9
-0} static void vce_v4_0_emit_wreg(struct amdgpu_ring *ring,@@ -995,6 +991,15 @@ static void vce_v4_0_emit_wreg(struct amdgpu_ring *ring,amdgpu_ring_write (ring, val); } +static void vce_v4_0_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask) +{ +amdgpu_ring_write (ring,VCE_CMD_REG_WAIT ); +amdgpu_ring_write (ring, reg <<2 ); +amdgpu_ring_write (ring, mask); +amdgpu_ring_write (ring, val); +} + static int vce_v4_0_set_interrupt_state(struct amdgpu_device *adev, struct amdgpu_irq_src *source, unsigned type,
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c static const struct amdgpu_ring_funcs vce_v4_0_ring_vm_funcs = { · line 1090
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +1
-0@@ -1079,6 +1084,7 @@ static const struct amdgpu_ring_funcs vce_v4_0_ring_vm_funcs = { .begin_use = amdgpu_vce_ring_begin_use, .end_use = amdgpu_vce_ring_end_use, .emit_wreg = vce_v4_0_emit_wreg, + .emit_reg_wait = vce_v4_0_emit_reg_wait, };static void vce_v4_0_set_ring_funcs (struct amdgpu_device *adev)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/13 drm/amdgpu: implement vcn_v1_0_(dec|enc)_ring_emit_reg_wait
In reply to a message not in the archiveAdd emit_reg_wait implementation for VCN v1.
--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +21 -8
@@ -838,17 +838,18 @@ static void vcn_v1_0_dec_ring_emit_ib(struct amdgpu_ring *ring,amdgpu_ring_write (ring, ib->length_dw); } -static void vcn_v1_0_dec_vm_reg_wait (struct amdgpu_ring *ring, -uint32_t data0,uint32_t data1,uint32_t mask) +static void vcn_v1_0_dec_ring_emit_reg_wait (struct amdgpu_ring *ring, +uint32_t reg,uint32_t val, +uint32_t mask) {struct amdgpu_device *adev = ring->adev;amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA0),0 )); -amdgpu_ring_write (ring, data0); +amdgpu_ring_write (ring, reg <<2 );amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA1),0 )); -amdgpu_ring_write (ring, data1); +amdgpu_ring_write (ring, val);amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GP_SCRATCH8),0 ));amdgpu_ring_write (ring, mask);
@@ -868,16 +869,16 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring, pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);/* wait for register write */ - data0 = (hub->ctx0_ptb_addr_lo32 + vmid *2 ) <<2 ; + data0 = hub->ctx0_ptb_addr_lo32 + vmid *2 ; data1 =lower_32_bits (pd_addr); mask =0xffffffff ; -vcn_v1_0_dec_vm_reg_wait (ring, data0, data1, mask); +vcn_v1_0_dec_ring_emit_reg_wait (ring, data0, data1, mask);/* wait for flush */ - data0 = (hub->vm_inv_eng0_ack + eng) <<2 ; + data0 = hub->vm_inv_eng0_ack + eng; data1 =1 << vmid; mask =1 << vmid; -vcn_v1_0_dec_vm_reg_wait (ring, data0, data1, mask); +vcn_v1_0_dec_ring_emit_reg_wait (ring, data0, data1, mask); } static void vcn_v1_0_dec_ring_emit_wreg(struct amdgpu_ring *ring,
@@ -1023,6 +1024,16 @@ static void vcn_v1_0_enc_ring_emit_wreg(struct amdgpu_ring *ring,amdgpu_ring_write (ring, val); } +static void vcn_v1_0_enc_ring_emit_reg_wait (struct amdgpu_ring *ring, +uint32_t reg,uint32_t val, +uint32_t mask) +{ +amdgpu_ring_write (ring,VCN_ENC_CMD_REG_WAIT ); +amdgpu_ring_write (ring, reg <<2 ); +amdgpu_ring_write (ring, mask); +amdgpu_ring_write (ring, val); +} + static int vcn_v1_0_set_interrupt_state(struct amdgpu_device *adev, struct amdgpu_irq_src *source, unsigned type,
@@ -1114,6 +1125,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .begin_use = amdgpu_vcn_ring_begin_use, .end_use = amdgpu_vcn_ring_end_use, .emit_wreg = vcn_v1_0_dec_ring_emit_wreg, + .emit_reg_wait = vcn_v1_0_dec_ring_emit_reg_wait, };static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = {
@@ -1141,6 +1153,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { .begin_use = amdgpu_vcn_ring_begin_use, .end_use = amdgpu_vcn_ring_end_use, .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, + .emit_reg_wait = vcn_v1_0_enc_ring_emit_reg_wait, };static void vcn_v1_0_set_dec_ring_funcs (struct amdgpu_device *adev)
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/13 drm/amdgpu: move waiting for VM flush into gmc_v9_0_emit_flush_gpu_tlb
In reply to a message not in the archiveKeep that at a common place instead of spread over all engines.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 19 +++++++++---------- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 18 +++--------------- drivers/gpu/drm/amd/amdgpu/soc15.h | 3 ++- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 20 ++++++-------------- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 9 +++------ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 22 ++++++---------------- 7 files changed, 33 insertions(+), 62 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +9 -10
@@ -3679,15 +3679,8 @@ static void gfx_v9_0_ring_emit_vm_flush(struct amdgpu_ring *ring, unsigned vmid, unsigned pasid, uint64_t pd_addr) { - struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; -unsigned eng = ring->vm_inv_eng; -amdgpu_gmc_emit_flush_gpu_tlb (ring ,vmid ,pasid ,pd_addr ); -/* wait for the invalidate to complete */ -gfx_v9_0_wait_reg_mem (ring,0 ,0 ,0 , hub->vm_inv_eng0_ack + eng, -0 ,1 << vmid,1 << vmid,0x20 ); -/* compute doesn't have PFP */ if (ring->funcs->type ==AMDGPU_RING_TYPE_GFX ) {/* sync PFP to ME, otherwise we might get invalid PFP reads */
@@ -4295,7 +4288,9 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .emit_frame_size = /* totally 242 maximum if 16 IBs */5 +/* COND_EXEC */ 7 +/* PIPELINE_SYNC */ -SOC15_FLUSH_GPU_TLB_NUM_WREG *5 +9 +/* VM_FLUSH */ +SOC15_FLUSH_GPU_TLB_NUM_WREG *5 + +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *7 + +2 +/* VM_FLUSH */ 8 +/* FENCE for VM_FLUSH */ 20 +/* GDS switch */ 4 + /* double SWITCH_BUFFER,
@@ -4344,7 +4339,9 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = {7 +/* gfx_v9_0_ring_emit_hdp_flush */ 5 +/* hdp invalidate */ 7 +/* gfx_v9_0_ring_emit_pipeline_sync */ -SOC15_FLUSH_GPU_TLB_NUM_WREG *5 +9 +/* gfx_v9_0_ring_emit_vm_flush */ +SOC15_FLUSH_GPU_TLB_NUM_WREG *5 + +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *7 + +2 +/* gfx_v9_0_ring_emit_vm_flush */ 8 + 8 + 8, /* gfx_v9_0_ring_emit_fence x3 for user fence, vm fence */ .emit_ib_size = 4, /* gfx_v9_0_ring_emit_ib_compute */ .emit_ib = gfx_v9_0_ring_emit_ib_compute,
@@ -4376,7 +4373,9 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = {7 +/* gfx_v9_0_ring_emit_hdp_flush */ 5 +/* hdp invalidate */ 7 +/* gfx_v9_0_ring_emit_pipeline_sync */ -SOC15_FLUSH_GPU_TLB_NUM_WREG *5 +9 +/* gfx_v9_0_ring_emit_vm_flush */ +SOC15_FLUSH_GPU_TLB_NUM_WREG *5 + +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *7 + +2 +/* gfx_v9_0_ring_emit_vm_flush */ 8 + 8 + 8, /* gfx_v9_0_ring_emit_fence_kiq x3 for user fence, vm fence */ .emit_ib_size = 4, /* gfx_v9_0_ring_emit_ib_compute */ .emit_ib = gfx_v9_0_ring_emit_ib_compute,
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +4 -0
@@ -395,6 +395,10 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,amdgpu_ring_emit_wreg (ring, hub->vm_inv_eng0_req + eng, req); +/* wait for the invalidate to complete */ +amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_ack + eng, +1 << vmid,1 << vmid); +return pd_addr; }
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +3 -15
@@ -1126,21 +1126,7 @@ static void sdma_v4_0_ring_emit_vm_flush(struct amdgpu_ring *ring, unsigned vmid, unsigned pasid, uint64_t pd_addr) { - struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; -unsigned eng = ring->vm_inv_eng; -amdgpu_gmc_emit_flush_gpu_tlb (ring ,vmid ,pasid ,pd_addr ); - -/* wait for flush */ -amdgpu_ring_write (ring,SDMA_PKT_HEADER_OP (SDMA_OP_POLL_REGMEM ) | -SDMA_PKT_POLL_REGMEM_HEADER_HDP_FLUSH (0 ) | -SDMA_PKT_POLL_REGMEM_HEADER_FUNC (3 ));/* equal */ -amdgpu_ring_write (ring, (hub->vm_inv_eng0_ack + eng) <<2 ); -amdgpu_ring_write (ring,0 ); -amdgpu_ring_write (ring,1 << vmid);/* reference */ -amdgpu_ring_write (ring,1 << vmid);/* mask */ -amdgpu_ring_write (ring,SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT (0xfff ) | -SDMA_PKT_POLL_REGMEM_DW5_INTERVAL (10 )); } static void sdma_v4_0_ring_emit_wreg(struct amdgpu_ring *ring,
@@ -1589,7 +1575,9 @@ static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = {6 +/* sdma_v4_0_ring_emit_hdp_flush */ 3 +/* hdp invalidate */ 6 +/* sdma_v4_0_ring_emit_pipeline_sync */ -SOC15_FLUSH_GPU_TLB_NUM_WREG *3 +6 +/* sdma_v4_0_ring_emit_vm_flush */ +/* sdma_v4_0_ring_emit_vm_flush */ +SOC15_FLUSH_GPU_TLB_NUM_WREG *3 + +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *6 + 10 + 10 + 10, /* sdma_v4_0_ring_emit_fence x3 for user fence, vm fence */ .emit_ib_size = 7 + 6, /* sdma_v4_0_ring_emit_ib */ .emit_ib = sdma_v4_0_ring_emit_ib,
drivers/gpu/drm/amd/amdgpu/soc15.h +2 -1
@@ -27,7 +27,8 @@#include "nbio_v6_1.h" #include "nbio_v7_0.h" -#define SOC15_FLUSH_GPU_TLB_NUM_WREG 4 +#define SOC15_FLUSH_GPU_TLB_NUM_WREG 4 +#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 1extern const struct amd_ip_funcs soc15_common_ip_funcs;
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +6 -14
@@ -1265,7 +1265,6 @@ static void uvd_v7_0_ring_emit_vm_flush(struct amdgpu_ring *ring, uint64_t pd_addr) {struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; -unsigned eng = ring->vm_inv_eng;uint32_t data0, data1, mask; pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);
@@ -1275,12 +1274,6 @@ static void uvd_v7_0_ring_emit_vm_flush(struct amdgpu_ring *ring, data1 =lower_32_bits (pd_addr); mask =0xffffffff ;uvd_v7_0_ring_emit_reg_wait (ring, data0, data1, mask); - -/* wait for flush */ - data0 = hub->vm_inv_eng0_ack + eng; - data1 =1 << vmid; - mask =1 << vmid; -uvd_v7_0_ring_emit_reg_wait (ring, data0, data1, mask); }static void uvd_v7_0_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count)
@@ -1303,17 +1296,12 @@ static void uvd_v7_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, uint64_t pd_addr) {struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; -unsigned eng = ring->vm_inv_eng; pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);/* wait for reg writes */ amdgpu_ring_emit_reg_wait (ring, hub->ctx0_ptb_addr_lo32 + vmid *2 ,lower_32_bits (pd_addr),0xffffffff ); - -/* wait for flush */ -amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_ack + eng, -1 << vmid,1 << vmid); } static void uvd_v7_0_enc_ring_emit_wreg(struct amdgpu_ring *ring,
@@ -1669,7 +1657,9 @@ static const struct amdgpu_ring_funcs uvd_v7_0_ring_vm_funcs = { .set_wptr = uvd_v7_0_ring_set_wptr, .emit_frame_size =6 +6 +/* hdp flush / invalidate */ -SOC15_FLUSH_GPU_TLB_NUM_WREG *6 +16 +/* uvd_v7_0_ring_emit_vm_flush */ +SOC15_FLUSH_GPU_TLB_NUM_WREG *6 + +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *8 + +8 +/* uvd_v7_0_ring_emit_vm_flush */ 14 + 14, /* uvd_v7_0_ring_emit_fence x2 vm fence */ .emit_ib_size = 8, /* uvd_v7_0_ring_emit_ib */ .emit_ib = uvd_v7_0_ring_emit_ib,
@@ -1696,7 +1686,9 @@ static const struct amdgpu_ring_funcs uvd_v7_0_enc_ring_vm_funcs = { .set_wptr = uvd_v7_0_enc_ring_set_wptr, .emit_frame_size =3 +3 +/* hdp flush / invalidate */ -SOC15_FLUSH_GPU_TLB_NUM_WREG *3 +8 +/* uvd_v7_0_enc_ring_emit_vm_flush */ +SOC15_FLUSH_GPU_TLB_NUM_WREG *3 + +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *4 + +4 +/* uvd_v7_0_enc_ring_emit_vm_flush */ 5 +5 +/* uvd_v7_0_enc_ring_emit_fence x2 vm fence */ 1, /* uvd_v7_0_enc_ring_insert_end */ .emit_ib_size = 5, /* uvd_v7_0_enc_ring_emit_ib */
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +3 -6
@@ -970,17 +970,12 @@ static void vce_v4_0_emit_vm_flush(struct amdgpu_ring *ring, uint64_t pd_addr) {struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; -unsigned eng = ring->vm_inv_eng; pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);/* wait for reg writes */ amdgpu_ring_emit_reg_wait (ring, hub->ctx0_ptb_addr_lo32 + vmid *2 ,lower_32_bits (pd_addr),0xffffffff ); - -/* wait for flush */ -amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_ack + eng, -1 << vmid,1 << vmid); } static void vce_v4_0_emit_wreg(struct amdgpu_ring *ring,
@@ -1069,7 +1064,9 @@ static const struct amdgpu_ring_funcs vce_v4_0_ring_vm_funcs = { .set_wptr = vce_v4_0_ring_set_wptr, .parse_cs = amdgpu_vce_ring_parse_cs_vm, .emit_frame_size = -SOC15_FLUSH_GPU_TLB_NUM_WREG *3 +8 +/* vce_v4_0_emit_vm_flush */ +SOC15_FLUSH_GPU_TLB_NUM_WREG *3 + +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *4 + +4 +/* vce_v4_0_emit_vm_flush */ 5 +5 +/* amdgpu_vce_ring_emit_fence x2 vm fence */ 1, /* vce_v4_0_ring_insert_end */ .emit_ib_size = 5, /* vce_v4_0_ring_emit_ib */
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +6 -16
@@ -863,7 +863,6 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring, uint64_t pd_addr) {struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; -unsigned eng = ring->vm_inv_eng;uint32_t data0, data1, mask; pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);
@@ -873,12 +872,6 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring, data1 =lower_32_bits (pd_addr); mask =0xffffffff ;vcn_v1_0_dec_ring_emit_reg_wait (ring, data0, data1, mask); - -/* wait for flush */ - data0 = hub->vm_inv_eng0_ack + eng; - data1 =1 << vmid; - mask =1 << vmid; -vcn_v1_0_dec_ring_emit_reg_wait (ring, data0, data1, mask); } static void vcn_v1_0_dec_ring_emit_wreg(struct amdgpu_ring *ring,
@@ -998,7 +991,6 @@ static void vcn_v1_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, uint64_t pd_addr) {struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; -unsigned eng = ring->vm_inv_eng; pd_addr =amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pasid, pd_addr);
@@ -1008,12 +1000,6 @@ static void vcn_v1_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, (hub->ctx0_ptb_addr_lo32 + vmid * 2) << 2);amdgpu_ring_write (ring,0xffffffff );amdgpu_ring_write (ring,lower_32_bits (pd_addr)); - -/* wait for flush */ -amdgpu_ring_write (ring,VCN_ENC_CMD_REG_WAIT ); -amdgpu_ring_write (ring, (hub->vm_inv_eng0_ack + eng) <<2 ); -amdgpu_ring_write (ring,1 << vmid); -amdgpu_ring_write (ring,1 << vmid); } static void vcn_v1_0_enc_ring_emit_wreg(struct amdgpu_ring *ring,
@@ -1109,7 +1095,9 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .set_wptr = vcn_v1_0_dec_ring_set_wptr, .emit_frame_size =6 +6 +/* hdp invalidate / flush */ -SOC15_FLUSH_GPU_TLB_NUM_WREG *6 +16 +/* vcn_v1_0_dec_ring_emit_vm_flush */ +SOC15_FLUSH_GPU_TLB_NUM_WREG *6 + +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *8 + +8 +/* vcn_v1_0_dec_ring_emit_vm_flush */ 14 +14 +/* vcn_v1_0_dec_ring_emit_fence x2 vm fence */ 6, .emit_ib_size = 8, /* vcn_v1_0_dec_ring_emit_ib */
@@ -1138,7 +1126,9 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { .get_wptr = vcn_v1_0_enc_ring_get_wptr, .set_wptr = vcn_v1_0_enc_ring_set_wptr, .emit_frame_size = -SOC15_FLUSH_GPU_TLB_NUM_WREG *3 +8 +/* vcn_v1_0_enc_ring_emit_vm_flush */ +SOC15_FLUSH_GPU_TLB_NUM_WREG *3 + +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *4 + +4 +/* vcn_v1_0_enc_ring_emit_vm_flush */ 5 +5 +/* vcn_v1_0_enc_ring_emit_fence x2 vm fence */ 1, /* vcn_v1_0_enc_ring_insert_end */ .emit_ib_size = 5, /* vcn_v1_0_enc_ring_emit_ib */
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/13 drm/amdgpu: enable VMID PASID mapping in the ATC
In reply to a message not in the archiveUpdate the PASID in the ATC as well and wait for the update to finish.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 21 ++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/soc15.h | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +20 -1
@@ -33,6 +33,7 @@#include "vega10_enum.h" #include "mmhub/mmhub_1_0_offset.h" #include "athub/athub_1_0_offset.h" +#include "athub/athub_1_0_sh_mask.h" #include "oss/osssys_4_0_offset.h" #include "soc15.h"
@@ -375,7 +376,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,uint32_t req =gmc_v9_0_get_invalidate_req (vmid);uint64_t flags =AMDGPU_PTE_VALID ;unsigned eng = ring->vm_inv_eng; -uint32_t reg; +uint32_t reg, val;amdgpu_gmc_get_vm_pde (ring->adev,-1 , &pd_addr, &flags); pd_addr |= flags;
@@ -393,8 +394,26 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,amdgpu_ring_emit_wreg (ring, reg, pasid); +if (ring->funcs->vmhub ==AMDGPU_GFXHUB ) + reg =SOC15_REG_OFFSET (ATHUB ,0 , mmATC_VMID0_PASID_MAPPING) + vmid; +else + reg =SOC15_REG_OFFSET (ATHUB ,0 , mmATC_VMID16_PASID_MAPPING) + vmid; + + val =0 ; + val =REG_SET_FIELD (val,ATC_VMID0_PASID_MAPPING ,PASID , pasid); + val =REG_SET_FIELD (val,ATC_VMID0_PASID_MAPPING ,VALID ,1 ); +amdgpu_ring_emit_wreg (ring, reg, val); +amdgpu_ring_emit_wreg (ring, hub->vm_inv_eng0_req + eng, req); +/* wait for the ATC to complete */ + reg =SOC15_REG_OFFSET (ATHUB ,0 , mmATC_VMID_PASID_MAPPING_UPDATE_STATUS); +if (ring->funcs->vmhub ==AMDGPU_GFXHUB ) + val =0x1 << vmid; +else + val =0x10000 << vmid; +amdgpu_ring_emit_reg_wait (ring, reg, val, val); +/* wait for the invalidate to complete */ amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_ack + eng,1 << vmid,1 << vmid);
drivers/gpu/drm/amd/amdgpu/soc15.h +2 -2
@@ -27,8 +27,8 @@#include "nbio_v6_1.h" #include "nbio_v7_0.h" -#define SOC15_FLUSH_GPU_TLB_NUM_WREG 4 -#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 1 +#define SOC15_FLUSH_GPU_TLB_NUM_WREG 5 +#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 2extern const struct amd_ip_funcs soc15_common_ip_funcs;
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180126201326.8829-10-christian.koenig-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 10/13] drm/amdgpu: enable VMID PASID mapping in the ATC
Could we cache the previous VMID/PASID mapping somewhere, and only update+wait if it changes?
If this is not the right place to check it (because multiple rings can be using the same VMID concurrently), maybe add a flag to emit_flush_gpu_tlb to update the PASID mapping conditionally, and make the decision higher up in then VM manager.
Regards,
Felix
Quoted 61 lines · Christian König
Update the PASID in the ATC as well and wait for the update to finish.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 21 ++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/soc15.h | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +20
-1@@ -33,6 +33,7 @@#include "vega10_enum.h" #include "mmhub/mmhub_1_0_offset.h" #include "athub/athub_1_0_offset.h" +#include "athub/athub_1_0_sh_mask.h" #include "oss/osssys_4_0_offset.h" #include "soc15.h" @@ -375,7 +376,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,uint32_t req =gmc_v9_0_get_invalidate_req (vmid);uint64_t flags =AMDGPU_PTE_VALID ;unsigned eng = ring->vm_inv_eng; -uint32_t reg; +uint32_t reg, val;amdgpu_gmc_get_vm_pde (ring->adev,-1 , &pd_addr, &flags); pd_addr |= flags;@@ -393,8 +394,26 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,amdgpu_ring_emit_wreg (ring, reg, pasid); +if (ring->funcs->vmhub ==AMDGPU_GFXHUB ) + reg =SOC15_REG_OFFSET (ATHUB ,0 , mmATC_VMID0_PASID_MAPPING) + vmid; +else + reg =SOC15_REG_OFFSET (ATHUB ,0 , mmATC_VMID16_PASID_MAPPING) + vmid; + + val =0 ; + val =REG_SET_FIELD (val,ATC_VMID0_PASID_MAPPING ,PASID , pasid); + val =REG_SET_FIELD (val,ATC_VMID0_PASID_MAPPING ,VALID ,1 ); +amdgpu_ring_emit_wreg (ring, reg, val); +amdgpu_ring_emit_wreg (ring, hub->vm_inv_eng0_req + eng, req); +/* wait for the ATC to complete */ + reg =SOC15_REG_OFFSET (ATHUB ,0 , mmATC_VMID_PASID_MAPPING_UPDATE_STATUS); +if (ring->funcs->vmhub ==AMDGPU_GFXHUB ) + val =0x1 << vmid; +else + val =0x10000 << vmid; +amdgpu_ring_emit_reg_wait (ring, reg, val, val); +/* wait for the invalidate to complete */ amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_ack + eng,1 << vmid,1 << vmid);drivers/gpu/drm/amd/amdgpu/soc15.h +0
-0
drivers/gpu/drm/amd/amdgpu/soc15.h line 34
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/soc15.h +2
-2@@ -27,8 +27,8 @@#include "nbio_v6_1.h" #include "nbio_v7_0.h" -#define SOC15_FLUSH_GPU_TLB_NUM_WREG 4 -#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 1 +#define SOC15_FLUSH_GPU_TLB_NUM_WREG 5 +#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 2extern const struct amd_ip_funcs soc15_common_ip_funcs;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 7313311d-90dc-e0ff-2333-184caf6eb9d2-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 10/13] drm/amdgpu: enable VMID PASID mapping in the ATC
Am 29.01.2018 um 23:05 schrieb Felix Kuehling:
Quoted 2 lines
Could we cache the previous VMID/PASID mapping somewhere, and only update+wait if it changes?
Good point. And yes that needs to be fixed, but this patch set was more of a prove of concept anyway.
Regards,
Christian.
Quoted 75 lines
If this is not the right place to check it (because multiple rings can be using the same VMID concurrently), maybe add a flag to
emit_flush_gpu_tlbto update the PASID mapping conditionally, and make the decision higher up in then VM manager.Regards,
FelixQuoted 64 lines · Christian König
Update the PASID in the ATC as well and wait for the update to finish.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 21 ++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/soc15.h | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +20
-1@@ -33,6 +33,7 @@#include "vega10_enum.h" #include "mmhub/mmhub_1_0_offset.h" #include "athub/athub_1_0_offset.h" +#include "athub/athub_1_0_sh_mask.h" #include "oss/osssys_4_0_offset.h" #include "soc15.h" @@ -375,7 +376,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,uint32_t req =gmc_v9_0_get_invalidate_req (vmid);uint64_t flags =AMDGPU_PTE_VALID ;unsigned eng = ring->vm_inv_eng; -uint32_t reg; +uint32_t reg, val;amdgpu_gmc_get_vm_pde (ring->adev,-1 , &pd_addr, &flags); pd_addr |= flags;@@ -393,8 +394,26 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,amdgpu_ring_emit_wreg (ring, reg, pasid); +if (ring->funcs->vmhub ==AMDGPU_GFXHUB ) + reg =SOC15_REG_OFFSET (ATHUB ,0 , mmATC_VMID0_PASID_MAPPING) + vmid; +else + reg =SOC15_REG_OFFSET (ATHUB ,0 , mmATC_VMID16_PASID_MAPPING) + vmid; + + val =0 ; + val =REG_SET_FIELD (val,ATC_VMID0_PASID_MAPPING ,PASID , pasid); + val =REG_SET_FIELD (val,ATC_VMID0_PASID_MAPPING ,VALID ,1 ); +amdgpu_ring_emit_wreg (ring, reg, val); +amdgpu_ring_emit_wreg (ring, hub->vm_inv_eng0_req + eng, req); +/* wait for the ATC to complete */ + reg =SOC15_REG_OFFSET (ATHUB ,0 , mmATC_VMID_PASID_MAPPING_UPDATE_STATUS); +if (ring->funcs->vmhub ==AMDGPU_GFXHUB ) + val =0x1 << vmid; +else + val =0x10000 << vmid; +amdgpu_ring_emit_reg_wait (ring, reg, val, val); +/* wait for the invalidate to complete */ amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_ack + eng,1 << vmid,1 << vmid);drivers/gpu/drm/amd/amdgpu/soc15.h +0
-0@@ -27,8 +27,8 @@#include "nbio_v6_1.h" #include "nbio_v7_0.h"
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/soc15.h line 34
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/soc15.h +2
-2-#define SOC15_FLUSH_GPU_TLB_NUM_WREG 4 -#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 1 +#define SOC15_FLUSH_GPU_TLB_NUM_WREG 5 +#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 2extern const struct amd_ip_funcs soc15_common_ip_funcs;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/13 drm/amdgpu: add DRM_AMDGPU_ATC config option
In reply to a message not in the archiveMove amd_iommu_v2 initialization into amdgpu when it is enabled.
This is WIP and really ugly since amdgpu should not depend directly on amd_iommu_v2.
--- drivers/gpu/drm/amd/amdgpu/Kconfig | 8 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 ++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 ++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/Kconfig +8 -0
@@ -40,5 +40,13 @@ config DRM_AMDGPU_GART_DEBUGFS Selecting this option creates a debugfs file to inspect the mapped pages. Uses more memory for housekeeping, enable only for debugging. +config DRM_AMDGPU_ATC + bool "Enable the ATC to provide SVM support" + depends on DRM_AMDGPU + depends on AMD_IOMMU_V2 + default y + help + This enables support for the ATC to provide a shared virtual memory implementation. + source "drivers/gpu/drm/amd/acp/Kconfig" source "drivers/gpu/drm/amd/display/Kconfig"
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +12 -0
@@ -35,6 +35,7 @@#include <linux/vgaarb.h> #include <linux/vga_switcheroo.h> #include <linux/efi.h> +#include <linux/amd-iommu.h> #include "amdgpu.h" #include "amdgpu_trace.h" #include "amdgpu_i2c.h"
@@ -1355,6 +1356,12 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) adev->ip_blocks[i].status.hw = true; } +#ifdef CONFIG_DRM_AMDGPU_ATC + r =amd_iommu_init_device (adev->pdev,0x10000 ); +if (r) +DRM_ERROR ("amd_iommu_init_device error %d\n" , r); +#endif +amdgpu_amdkfd_device_init (adev);if (amdgpu_sriov_vf (adev))
@@ -1428,6 +1435,11 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)int i, r;amdgpu_amdkfd_device_fini (adev); + +#ifdef CONFIG_DRM_AMDGPU_ATC +amd_iommu_free_device (adev->pdev); +#endif +/* need to disable SMC first */ for (i =0 ; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.hw)
drivers/gpu/drm/amd/amdkfd/kfd_device.c +10 -1
@@ -373,7 +373,10 @@ void kgd2kfd_suspend(struct kfd_dev *kfd)amd_iommu_set_invalidate_ctx_cb (kfd->pdev,NULL );amd_iommu_set_invalid_ppr_cb (kfd->pdev,NULL ); + +#ifndef CONFIG_DRM_AMDGPU_ATC amd_iommu_free_device (kfd->pdev); +#endif }int kgd2kfd_resume (struct kfd_dev *kfd)
@@ -388,11 +391,15 @@ int kgd2kfd_resume(struct kfd_dev *kfd)static int kfd_resume (struct kfd_dev *kfd) {int err =0 ; + +#ifndef CONFIG_DRM_AMDGPU_ATC unsigned int pasid_limit =kfd_get_pasid_limit (); err =amd_iommu_init_device (kfd->pdev, pasid_limit);if (err)return -ENXIO ; +#endif +amd_iommu_set_invalidate_ctx_cb (kfd->pdev, iommu_pasid_shutdown_callback); amd_iommu_set_invalid_ppr_cb(kfd->pdev,
@@ -414,8 +421,10 @@ static int kfd_resume(struct kfd_dev *kfd) dqm_start_error: processes_bind_error: -amd_iommu_free_device (kfd->pdev); +#ifndef CONFIG_DRM_AMDGPU_ATC +amd_iommu_free_device (kfd->pdev); +#endif return err; }
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180126201326.8829-11-christian.koenig-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 11/13] drm/amdgpu: add DRM_AMDGPU_ATC config option
Quoted 43 lines · Christian König
Move
amd_iommu_v2initialization into amdgpu when it is enabled.This is WIP and really ugly since amdgpu should not depend directly on
amd_iommu_v2.Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Kconfig | 8 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 ++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 ++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/Kconfig +8
-0@@ -40,5 +40,13 @@ config DRM_AMDGPU_GART_DEBUGFS Selecting this option creates a debugfs file to inspect the mapped pages. Uses more memory for housekeeping, enable only for debugging. +config DRM_AMDGPU_ATC + bool "Enable the ATC to provide SVM support" + depends on DRM_AMDGPU + depends on AMD_IOMMU_V2 + default y + help + This enables support for the ATC to provide a shared virtual memory implementation. + source "drivers/gpu/drm/amd/acp/Kconfig" source "drivers/gpu/drm/amd/display/Kconfig"drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0@@ -35,6 +35,7 @@#include <linux/vgaarb.h> #include <linux/vga_switcheroo.h> #include <linux/efi.h> +#include <linux/amd-iommu.h> #include "amdgpu.h" #include "amdgpu_trace.h" #include "amdgpu_i2c.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_device_ip_init(struct amdgpu_device *adev) · line 1360
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0@@ -1355,6 +1356,12 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) adev->ip_blocks[i].status.hw = true; } +#ifdef CONFIG_DRM_AMDGPU_ATC + r =amd_iommu_init_device (adev->pdev,0x10000 );
KFD queries how many PASIDs the IOMMU can support with amd_iommu_device_info. KFD only assigns PASIDs within that range. It can be much smaller than the 16-bits supported by the GPU.
For a VM that uses ATC, you need to make sure it gets a PASID in the range supported by the IOMMU. The PASID manager already supports that and keeps smaller PASIDs for users that really need them.
Regards,
Felix
Quoted 52 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +9
-0+if (r) +DRM_ERROR ("amd_iommu_init_device error %d\n" , r); +#endif +amdgpu_amdkfd_device_init (adev);if (amdgpu_sriov_vf (adev))@@ -1428,6 +1435,11 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)int i, r;amdgpu_amdkfd_device_fini (adev); + +#ifdef CONFIG_DRM_AMDGPU_ATC +amd_iommu_free_device (adev->pdev); +#endif +/* need to disable SMC first */ for (i =0 ; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.hw)drivers/gpu/drm/amd/amdkfd/kfd_device.c +7
-0@@ -373,7 +373,10 @@ void kgd2kfd_suspend(struct kfd_dev *kfd)amd_iommu_set_invalidate_ctx_cb (kfd->pdev,NULL );amd_iommu_set_invalid_ppr_cb (kfd->pdev,NULL ); + +#ifndef CONFIG_DRM_AMDGPU_ATC amd_iommu_free_device (kfd->pdev); +#endif }int kgd2kfd_resume (struct kfd_dev *kfd)@@ -388,11 +391,15 @@ int kgd2kfd_resume(struct kfd_dev *kfd)static int kfd_resume (struct kfd_dev *kfd) {int err =0 ; + +#ifndef CONFIG_DRM_AMDGPU_ATC unsigned int pasid_limit =kfd_get_pasid_limit (); err =amd_iommu_init_device (kfd->pdev, pasid_limit);if (err)return -ENXIO ; +#endif +amd_iommu_set_invalidate_ctx_cb (kfd->pdev, iommu_pasid_shutdown_callback); amd_iommu_set_invalid_ppr_cb(kfd->pdev,@@ -414,8 +421,10 @@ static int kfd_resume(struct kfd_dev *kfd)
drivers/gpu/drm/amd/amdkfd/kfd_device.c static int kfd_resume(struct kfd_dev *kfd) · line 430
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_device.c +3
-1dqm_start_error: processes_bind_error: -amd_iommu_free_device (kfd->pdev); +#ifndef CONFIG_DRM_AMDGPU_ATC +amd_iommu_free_device (kfd->pdev); +#endif return err; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 6cf4bd37-fbf1-1fb4-496a-d62e403aea6f-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 11/13] drm/amdgpu: add DRM_AMDGPU_ATC config option
Am 29.01.2018 um 23:08 schrieb Felix Kuehling:
Quoted 11 lines · Christian König
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_device_ip_init(struct amdgpu_device *adev) · line 1360
Quoted 3 lines
[SNIP]
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+#ifdef CONFIG_DRM_AMDGPU_ATC + r =amd_iommu_init_device (adev->pdev,0x10000 );KFD queries how many PASIDs the IOMMU can support with
amd_iommu_device_info. KFD only assigns PASIDs within that range. It can be much smaller than the 16-bits supported by the GPU.For a VM that uses ATC, you need to make sure it gets a PASID in the range supported by the IOMMU. The PASID manager already supports that and keeps smaller PASIDs for users that really need them.
Yeah, seen that and I'm not really keen about it.
Especially since we need multiple types of PASIDs here:
1. For GPUVM debugging and HMM faults, where we can use the full 16bit range without worrying about what IOMMU can do.
2. For ATC use case where we need to keep the IOMMU in the picture.
Are there any hardware limitations which blocks us from using a per device PASID? That would simplify the whole handling quite a bit.
Additional to that we don't really want this direct relationship between amdgpu/amdkfd and the amd_iommu_v2 driver.
So what do you think about moving the PASID handling into the IOMMU driver? And abstracting which driver is in use through the iommu_ops?
Regards,
Christian.
Quoted 3 lines
Regards,
Felix
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 7ebabb2b-1b18-8c7b-626f-d6874bdaac80-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Re: [PATCH 11/13] drm/amdgpu: add DRM_AMDGPU_ATC config option
Quoted 15 lines · Christian König
Am 29.01.2018 um 23:08 schrieb Felix Kuehling:
Quoted 11 lines · Christian König
Quoted 3 lines
[SNIP]
+#ifdefCONFIG_DRM_AMDGPU_ATC
+ r =amd_iommu_init_device(adev->pdev, 0x10000);KFD queries how many PASIDs the IOMMU can support with
amd_iommu_device_info. KFD only assigns PASIDs within that range. It can be much smaller than the 16-bits supported by the GPU.For a VM that uses ATC, you need to make sure it gets a PASID in the range supported by the IOMMU. The PASID manager already supports that and keeps smaller PASIDs for users that really need them.
Yeah, seen that and I'm not really keen about it.
Quoted 7 lines
Especially since we need multiple types of PASIDs here:
1. For GPUVM debugging and HMM faults, where we can use the full 16bit range without worrying about what IOMMU can do.
2. For ATC use case where we need to keep the IOMMU in the picture.Are there any hardware limitations which blocks us from using a per device PASID? That would simplify the whole handling quite a bit.
Conceptually PASIDs are device-specific process IDs. KFD uses the same PASID on all devices, but that's not necessary.
Currently you allocate PASIDs per VM or per open device file. So you'll end up with different PASIDs on each device. I think you can even end up with multiple PASIDs in each process even on the same device, if you create multiple VMs. That doesn't seem to be a problem for the IOMMU driver.
Quoted 3 lines
Additional to that we don't really want this direct relationship between amdgpu/amdkfd and the
amd_iommu_v2driver.
Not sure what you mean. Right now amdgpu and amdkfd don't coordinate their PASIDs (other than using a common allocator to avoid using the same PASID for different things).
Quoted 3 lines
So what do you think about moving the PASID handling into the IOMMU driver? And abstracting which driver is in use through the
iommu_ops?
What if both drivers want to use the IOMMU?
Regards,
Felix
Quoted 7 lines
Regards,
Christian.Quoted 3 lines
Regards,
Felix
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): c39b444b-49a1-771a-65ba-ae37ba643673-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 11/13] drm/amdgpu: add DRM_AMDGPU_ATC config option
Quoted 42 lines · Felix Kuehling
Quoted 15 lines · Christian König
Am 29.01.2018 um 23:08 schrieb Felix Kuehling:
Quoted 11 lines · Christian König
Review
Quoted 3 lines
[SNIP]
(quoted diff) +2
-0+#ifdef CONFIG_DRM_AMDGPU_ATC + r = amd_iommu_init_device(adev->pdev, 0x10000);KFD queries how many PASIDs the IOMMU can support with
amd_iommu_device_info. KFD only assigns PASIDs within that range. It can be much smaller than the 16-bits supported by the GPU.For a VM that uses ATC, you need to make sure it gets a PASID in the range supported by the IOMMU. The PASID manager already supports that and keeps smaller PASIDs for users that really need them.
Yeah, seen that and I'm not really keen about it.
Quoted 7 lines
Especially since we need multiple types of PASIDs here:
1. For GPUVM debugging and HMM faults, where we can use the full 16bit range without worrying about what IOMMU can do.
2. For ATC use case where we need to keep the IOMMU in the picture.Are there any hardware limitations which blocks us from using a per device PASID? That would simplify the whole handling quite a bit.
Conceptually PASIDs are device-specific process IDs. KFD uses the same PASID on all devices, but that's not necessary.
Currently you allocate PASIDs per VM or per open device file. So you'll end up with different PASIDs on each device. I think you can even end up with multiple PASIDs in each process even on the same device, if you create multiple VMs. That doesn't seem to be a problem for the IOMMU driver.
Quoted 3 lines
Additional to that we don't really want this direct relationship between amdgpu/amdkfd and the
amd_iommu_v2driver.Not sure what you mean. Right now amdgpu and amdkfd don't coordinate their PASIDs (other than using a common allocator to avoid using the same PASID for different things).
Quoted 1 line
Quoted 5 lines
Quoted 2 lines
So what do you think about moving the PASID handling into the IOMMU driver? And abstracting which driver is in use through the
iommu_ops?What if both drivers want to use the IOMMU?
There was some discussion last year about a generic PASID allocator in the iommu subsystem:
https://lists.linuxfoundation.org/pipermail/iommu/2017-June/022159.html
Unfortunately, I don't think it got any further then that.
Oded
Quoted 8 lines
Regards,
FelixQuoted 5 lines
Regards,
Christian.Quoted 1 line
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Regards,
Felix_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CAFCwf12ho2gXrBUHtaKRV-mX2kRk45xeu2o=F0-=Q+GFkAs=RA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 11/13] drm/amdgpu: add DRM_AMDGPU_ATC config option
Adding Jean and the IOMMU list as well.
Am 31.01.2018 um 13:43 schrieb Oded Gabbay:
Quoted 7 lines · Felix Kuehling
Quoted 1 line
[SNIP]
There was some discussion last year about a generic PASID allocator in the iommu subsystem:
https://lists.linuxfoundation.org/pipermail/iommu/2017-June/022159.htmlUnfortunately, I don't think it got any further then that.
Yeah, that sounds exactly like what I had in mind as well.
Jean any updates on that topic? We are rather interested in common PASID handling as well.
Anybody already working on this? Sounds mostly like moving code around and creating a common interface.
Thanks,
Christian.
A message that is not in the archive (sent off-list or not yet received): 6b19483a-79f3-e5e0-307f-ead73b4e2b7a-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 11/13] drm/amdgpu: add DRM_AMDGPU_ATC config option
Hi Christian,
Quoted 10 lines · Christian König
Adding Jean and the IOMMU list as well.
Am 31.01.2018 um 13:43 schrieb Oded Gabbay:
Quoted 7 lines · Felix Kuehling
Quoted 1 line
[SNIP]
There was some discussion last year about a generic PASID allocator in the iommu subsystem:
https://lists.linuxfoundation.org/pipermail/iommu/2017-June/022159.htmlUnfortunately, I don't think it got any further then that.
I also sent an RFCv2 in October:
https://www.spinics.net/lists/arm-kernel/msg609771.html
Quoted 4 lines
Yeah, that sounds exactly like what I had in mind as well.
Jean any updates on that topic? We are rather interested in common PASID handling as well.
Good to hear, I plan to send a new version of that series after the merge window.
Thanks,
Jean
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 12/13 drm/amdgpu: add amdgpu_pasid_bind/undbing
In reply to a message not in the archiveAllow us to bind a PASID to the current process and unbind it when the VM isn't used any more.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 28 ++++++++++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- 3 files changed, 30 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +26 -2
@@ -24,6 +24,7 @@#include <linux/idr.h> #include <linux/dma-fence-array.h> +#include <linux/amd-iommu.h> #include <drm/drmP.h> #include "amdgpu.h"
@@ -43,6 +44,7 @@ static DEFINE_IDA(amdgpu_pasid_ida);/* Helper to free pasid from a fence callback */ struct amdgpu_pasid_cb {struct dma_fence_cb cb; +struct pci_dev *pdev;unsigned int pasid; };
@@ -85,12 +87,30 @@ void amdgpu_pasid_free(unsigned int pasid)ida_simple_remove (&amdgpu_pasid_ida, pasid); } +int amdgpu_pasid_bind (struct pci_dev *pdev,unsigned int pasid) +{ +#ifdef CONFIG_DRM_AMDGPU_ATC +return amd_iommu_bind_pasid (pdev, pasid, current); +#else +return -ENODEV ; +#endif +} + +void amdgpu_pasid_unbind (struct pci_dev *pdev,unsigned int pasid) +{ +#ifdef CONFIG_DRM_AMDGPU_ATC +if (pdev) +amd_iommu_unbind_pasid (pdev, pasid); +#endif +} +static void amdgpu_pasid_free_cb (struct dma_fence *fence,struct dma_fence_cb *_cb) {struct amdgpu_pasid_cb *cb = container_of(_cb, struct amdgpu_pasid_cb, cb); +amdgpu_pasid_unbind (cb->pdev, cb->pasid);amdgpu_pasid_free (cb->pasid);dma_fence_put (fence);kfree (cb);
@@ -100,11 +120,13 @@ static void amdgpu_pasid_free_cb(struct dma_fence *fence,* amdgpu_pasid_free_delayed - free pasid when fences signal * * @resv: reservation object with the fences to wait for +* @pdev: optional pci device to unbind the PASID from * @pasid: pasid to free * * Free the pasid only after all the fences in resv are signaled. */ void amdgpu_pasid_free_delayed (struct reservation_object *resv, +struct pci_dev *pdev,unsigned int pasid) {struct dma_fence *fence, **fences;
@@ -117,6 +139,7 @@ void amdgpu_pasid_free_delayed(struct reservation_object *resv, goto fallback;if (count ==0 ) { +amdgpu_pasid_unbind (pdev, pasid);amdgpu_pasid_free (pasid);return ; }
@@ -140,10 +163,10 @@ void amdgpu_pasid_free_delayed(struct reservation_object *resv, cb =kmalloc (sizeof (*cb),GFP_KERNEL );if (!cb) {/* Last resort when we are OOM */ -dma_fence_wait (fence, false);dma_fence_put (fence); -amdgpu_pasid_free (pasid); + goto fallback; }else { + cb->pdev = pdev; cb->pasid = pasid;if (dma_fence_add_callback (fence, &cb->cb, amdgpu_pasid_free_cb))
@@ -158,6 +181,7 @@ void amdgpu_pasid_free_delayed(struct reservation_object *resv,*/ reservation_object_wait_timeout_rcu (resv, true, false,MAX_SCHEDULE_TIMEOUT ); +amdgpu_pasid_unbind (pdev, pasid);amdgpu_pasid_free (pasid); }
drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h +3 -0
@@ -69,7 +69,10 @@ struct amdgpu_vmid_mgr {int amdgpu_pasid_alloc (unsigned int bits);void amdgpu_pasid_free (unsigned int pasid); +int amdgpu_pasid_bind (struct pci_dev *pdev,unsigned int pasid); +void amdgpu_pasid_unbind (struct pci_dev *pdev,unsigned int pasid);void amdgpu_pasid_free_delayed (struct reservation_object *resv, +struct pci_dev *pdev,unsigned int pasid); bool amdgpu_vmid_had_gpu_reset(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -1
@@ -927,7 +927,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,amdgpu_vm_fini (adev, &fpriv->vm);if (pasid) -amdgpu_pasid_free_delayed (pd->tbo.resv, pasid); +amdgpu_pasid_free_delayed (pd->tbo.resv,NULL , pasid);amdgpu_bo_unref (&pd);idr_for_each_entry (&fpriv->bo_list_handles, list, handle)
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/13 drm/amdgpu: add AMDGPU_VM_OP_ENABLE_SVM IOCTL
In reply to a message not in the archiveAdd an IOCTL to enable SVM for the current process.
One step further towards HMM support.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 94 +++++++++++++++++++++++++++++++-- include/uapi/drm/amdgpu_drm.h | 1 + 3 files changed, 94 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +3 -1
@@ -897,6 +897,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,struct amdgpu_fpriv *fpriv = file_priv->driver_priv;struct amdgpu_bo_list *list;struct amdgpu_bo *pd; +struct pci_dev *pdev;unsigned int pasid;int handle;
@@ -923,11 +924,12 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, } pasid = fpriv->vm.pasid; + pdev = fpriv->vm.pte_support_ats ? adev->pdev :NULL ; pd =amdgpu_bo_ref (fpriv->vm.root.base.bo);amdgpu_vm_fini (adev, &fpriv->vm);if (pasid) -amdgpu_pasid_free_delayed (pd->tbo.resv,NULL , pasid); +amdgpu_pasid_free_delayed (pd->tbo.resv, pdev, pasid);amdgpu_bo_unref (&pd);idr_for_each_entry (&fpriv->bo_list_handles, list, handle)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +90 -4
132 lines not on this page · raw message
include/uapi/drm/amdgpu_drm.h +1 -0
@@ -223,6 +223,7 @@ union drm_amdgpu_ctx {/* vm ioctl */ #define AMDGPU_VM_OP_RESERVE_VMID 1#define AMDGPU_VM_OP_UNRESERVE_VMID 2 +#define AMDGPU_VM_OP_ENABLE_SVM 3struct drm_amdgpu_vm_in {/** AMDGPU_VM_OP_* */
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180126201326.8829-13-christian.koenig-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 13/13] drm/amdgpu: add AMDGPU_VM_OP_ENABLE_SVM IOCTL
Enabling SVM after the VM has been created and the PASID allocated is problematic because the IOMMU can support a smaller range of PASIDs than the GPU. Ideally SVM would be a flag during VM creation, but I see that doesn't work as it's done in amdgpu_driver_open_kms, not in an ioctl.
Could the PASID be changed on an existing VM if necessary?
One more comment inline ...
Quoted 123 lines · Christian König
Add an IOCTL to enable SVM for the current process.
One step further towards HMM support.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 94 +++++++++++++++++++++++++++++++-- include/uapi/drm/amdgpu_drm.h | 1 + 3 files changed, 94 insertions(+), 5 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +3
-1@@ -897,6 +897,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,struct amdgpu_fpriv *fpriv = file_priv->driver_priv;struct amdgpu_bo_list *list;struct amdgpu_bo *pd; +struct pci_dev *pdev;unsigned int pasid;int handle;@@ -923,11 +924,12 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, } pasid = fpriv->vm.pasid; + pdev = fpriv->vm.pte_support_ats ? adev->pdev :NULL ; pd =amdgpu_bo_ref (fpriv->vm.root.base.bo);amdgpu_vm_fini (adev, &fpriv->vm);if (pasid) -amdgpu_pasid_free_delayed (pd->tbo.resv,NULL , pasid); +amdgpu_pasid_free_delayed (pd->tbo.resv, pdev, pasid);amdgpu_bo_unref (&pd);idr_for_each_entry (&fpriv->bo_list_handles, list, handle)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +54
-3@@ -257,6 +257,24 @@ bool amdgpu_vm_ready(struct amdgpu_vm *vm)return ready; } +/** +* amdgpu_vm_root_ats_entries - number of ATS entries in the root PD +* +* @adev: amdgpu_device pointer +* +* Returns number of entries in the root PD which should be initialized for ATS +* use. +*/ +static unsigned amdgpu_vm_root_ats_entries (struct amdgpu_device *adev) +{ +unsigned level = adev->vm_manager.root_level; +unsigned shift; + + shift =amdgpu_vm_level_shift (adev, level); + shift +=AMDGPU_GPU_PAGE_SHIFT ; +return AMDGPU_VA_HOLE_START >> shift; +} +/** * amdgpu_vm_clear_bo - initially clear the PDs/PTs * @@ -283,9 +301,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,if (pte_support_ats) {if (level == adev->vm_manager.root_level) { - ats_entries =amdgpu_vm_level_shift (adev, level); - ats_entries +=AMDGPU_GPU_PAGE_SHIFT ; - ats_entries =AMDGPU_VA_HOLE_START >> ats_entries; + ats_entries =amdgpu_vm_root_ats_entries (adev); ats_entries =min (ats_entries, entries); entries -= ats_entries; }else {@@ -329,6 +345,9 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,amdgpu_ring_pad_ib (ring, &job->ibs[0 ]); +amdgpu_sync_resv (adev, &job->sync, bo->tbo.resv, +AMDGPU_FENCE_OWNER_VM , false); +WARN_ON (job->ibs[0 ].length_dw >64 ); r =amdgpu_job_submit (job, ring, &vm->entity,AMDGPU_FENCE_OWNER_UNDEFINED , &fence);@@ -2557,6 +2576,71 @@ bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev,return true; } +/** +* amdgpu_vm_enable_svm - enable SVM +* +* @adev: amdgpu_device pointer +* @vm: VM to enable SVM +* +* Initialize SVM. +*/ +int amdgpu_vm_enable_svm (struct amdgpu_device *adev,struct amdgpu_vm *vm) +{ +int r; + +if (!vm->pasid) +return -ENODEV ; + + r =amdgpu_bo_reserve (vm->root.base.bo, false); +if (r) +return r; + +if (vm->pte_support_ats) { + r = -EALREADY ; + goto error_unlock; + } + +if (vm->root.entries) { +unsigned i, entries; + + entries =amdgpu_vm_root_ats_entries (adev); +for (i =0 ; i < entries; ++i) { +if (vm->root.entries[i].base.bo) { + r = -EEXIST ; + goto error_unlock;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev, · line 2620
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +10
-0+ } + } + + entries =amdgpu_bo_size (vm->root.base.bo) /8 ; +spin_lock (&vm->status_lock); +for (; i < entries; ++i) { +struct amdgpu_vm_pt *pt = &vm->root.entries[i]; + +if (pt->base.bo) +list_move (&pt->base.vm_status, &vm->moved);
I think this is only necessary because you clear the whole root PD BO with amdgpu_vm_clear_bo. But could that function be more selective and update only the clear the ATS entries? Maybe with an extra parameter?
Regards,
Felix
Quoted 51 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +26
-1+ } +spin_unlock (&vm->status_lock); + } + + r =amdgpu_pasid_bind (adev->pdev, vm->pasid); +if (r) + goto error_unlock; + + r =amdgpu_vm_clear_bo (adev, vm, vm->root.base.bo, + adev->vm_manager.root_level, + true); +if (r) { +amdgpu_pasid_unbind (adev->pdev, vm->pasid); + goto error_unlock; + } + + vm->pte_support_ats = true; + +error_unlock: +amdgpu_bo_unreserve (vm->root.base.bo); +return r; +} +/** * amdgpu_vm_manager_init - init the VM manager * @@ -2616,9 +2700,9 @@ void amdgpu_vm_manager_fini(struct amdgpu_device *adev)int amdgpu_vm_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) { -union drm_amdgpu_vm *args = data;struct amdgpu_device *adev = dev->dev_private;struct amdgpu_fpriv *fpriv = filp->driver_priv; +union drm_amdgpu_vm *args = data;int r;switch (args->in.op) {@@ -2631,6 +2715,8 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)case AMDGPU_VM_OP_UNRESERVE_VMID :amdgpu_vmid_free_reserved (adev, &fpriv->vm,AMDGPU_GFXHUB );break ; +case AMDGPU_VM_OP_ENABLE_SVM : +return amdgpu_vm_enable_svm (adev, &fpriv->vm);default :return -EINVAL ; }include/uapi/drm/amdgpu_drm.h +0
-0
include/uapi/drm/amdgpu_drm.h union drm_amdgpu_ctx { · line 229
Quoted 7 lines
include/uapi/drm/amdgpu_drm.h +1
-0@@ -223,6 +223,7 @@ union drm_amdgpu_ctx {/* vm ioctl */ #define AMDGPU_VM_OP_RESERVE_VMID 1#define AMDGPU_VM_OP_UNRESERVE_VMID 2 +#define AMDGPU_VM_OP_ENABLE_SVM 3struct drm_amdgpu_vm_in {/** AMDGPU_VM_OP_* */
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 22437f1c-cecb-1f25-cf90-9f54663bad12-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 13/13] drm/amdgpu: add AMDGPU_VM_OP_ENABLE_SVM IOCTL
Am 29.01.2018 um 23:27 schrieb Felix Kuehling:
Quoted 6 lines
Enabling SVM after the VM has been created and the PASID allocated is problematic because the IOMMU can support a smaller range of PASIDs than the GPU. Ideally SVM would be a flag during VM creation, but I see that doesn't work as it's done in
amdgpu_driver_open_kms, not in an ioctl.Could the PASID be changed on an existing VM if necessary?
Yeah, that shouldn't be much of a problem.
Another issue is that the VM can potentially be created by the X server, but then used by the client with DRI3.
So we would always need a separate IOCTL to note to which process a VM should bind.
Regards,
Christian.
Quoted 200 lines
One more comment inline ...
Quoted 123 lines · Christian König
Add an IOCTL to enable SVM for the current process.
One step further towards HMM support.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 94 +++++++++++++++++++++++++++++++-- include/uapi/drm/amdgpu_drm.h | 1 + 3 files changed, 94 insertions(+), 5 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +3
-1@@ -897,6 +897,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,struct amdgpu_fpriv *fpriv = file_priv->driver_priv;struct amdgpu_bo_list *list;struct amdgpu_bo *pd; +struct pci_dev *pdev;unsigned int pasid;int handle;@@ -923,11 +924,12 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, } pasid = fpriv->vm.pasid; + pdev = fpriv->vm.pte_support_ats ? adev->pdev :NULL ; pd =amdgpu_bo_ref (fpriv->vm.root.base.bo);amdgpu_vm_fini (adev, &fpriv->vm);if (pasid) -amdgpu_pasid_free_delayed (pd->tbo.resv,NULL , pasid); +amdgpu_pasid_free_delayed (pd->tbo.resv, pdev, pasid);amdgpu_bo_unref (&pd);idr_for_each_entry (&fpriv->bo_list_handles, list, handle)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +54
-3@@ -257,6 +257,24 @@ bool amdgpu_vm_ready(struct amdgpu_vm *vm)return ready; } +/** +* amdgpu_vm_root_ats_entries - number of ATS entries in the root PD +* +* @adev: amdgpu_device pointer +* +* Returns number of entries in the root PD which should be initialized for ATS +* use. +*/ +static unsigned amdgpu_vm_root_ats_entries (struct amdgpu_device *adev) +{ +unsigned level = adev->vm_manager.root_level; +unsigned shift; + + shift =amdgpu_vm_level_shift (adev, level); + shift +=AMDGPU_GPU_PAGE_SHIFT ; +return AMDGPU_VA_HOLE_START >> shift; +} +/** * amdgpu_vm_clear_bo - initially clear the PDs/PTs * @@ -283,9 +301,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,if (pte_support_ats) {if (level == adev->vm_manager.root_level) { - ats_entries =amdgpu_vm_level_shift (adev, level); - ats_entries +=AMDGPU_GPU_PAGE_SHIFT ; - ats_entries =AMDGPU_VA_HOLE_START >> ats_entries; + ats_entries =amdgpu_vm_root_ats_entries (adev); ats_entries =min (ats_entries, entries); entries -= ats_entries; }else {@@ -329,6 +345,9 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,amdgpu_ring_pad_ib (ring, &job->ibs[0 ]); +amdgpu_sync_resv (adev, &job->sync, bo->tbo.resv, +AMDGPU_FENCE_OWNER_VM , false); +WARN_ON (job->ibs[0 ].length_dw >64 ); r =amdgpu_job_submit (job, ring, &vm->entity,AMDGPU_FENCE_OWNER_UNDEFINED , &fence);@@ -2557,6 +2576,71 @@ bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev,return true; } +/** +* amdgpu_vm_enable_svm - enable SVM +* +* @adev: amdgpu_device pointer +* @vm: VM to enable SVM +* +* Initialize SVM. +*/ +int amdgpu_vm_enable_svm (struct amdgpu_device *adev,struct amdgpu_vm *vm) +{ +int r; + +if (!vm->pasid) +return -ENODEV ; + + r =amdgpu_bo_reserve (vm->root.base.bo, false); +if (r) +return r; + +if (vm->pte_support_ats) { + r = -EALREADY ; + goto error_unlock; + } + +if (vm->root.entries) { +unsigned i, entries; + + entries =amdgpu_vm_root_ats_entries (adev); +for (i =0 ; i < entries; ++i) { +if (vm->root.entries[i].base.bo) { + r = -EEXIST ; + goto error_unlock;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev, · line 2620
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +10
-0+ } + } + + entries =amdgpu_bo_size (vm->root.base.bo) /8 ; +spin_lock (&vm->status_lock); +for (; i < entries; ++i) { +struct amdgpu_vm_pt *pt = &vm->root.entries[i]; + +if (pt->base.bo) +list_move (&pt->base.vm_status, &vm->moved);I think this is only necessary because you clear the whole root PD BO with
amdgpu_vm_clear_bo. But could that function be more selective and update only the clear the ATS entries? Maybe with an extra parameter?Regards,
FelixQuoted 56 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +26
-1+ } +spin_unlock (&vm->status_lock); + } + + r =amdgpu_pasid_bind (adev->pdev, vm->pasid); +if (r) + goto error_unlock; + + r =amdgpu_vm_clear_bo (adev, vm, vm->root.base.bo, + adev->vm_manager.root_level, + true); +if (r) { +amdgpu_pasid_unbind (adev->pdev, vm->pasid); + goto error_unlock; + } + + vm->pte_support_ats = true; + +error_unlock: +amdgpu_bo_unreserve (vm->root.base.bo); +return r; +} +/** * amdgpu_vm_manager_init - init the VM manager * @@ -2616,9 +2700,9 @@ void amdgpu_vm_manager_fini(struct amdgpu_device *adev)int amdgpu_vm_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) { -union drm_amdgpu_vm *args = data;struct amdgpu_device *adev = dev->dev_private;struct amdgpu_fpriv *fpriv = filp->driver_priv; +union drm_amdgpu_vm *args = data;int r;switch (args->in.op) {@@ -2631,6 +2715,8 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)case AMDGPU_VM_OP_UNRESERVE_VMID :amdgpu_vmid_free_reserved (adev, &fpriv->vm,AMDGPU_GFXHUB );break ; +case AMDGPU_VM_OP_ENABLE_SVM : +return amdgpu_vm_enable_svm (adev, &fpriv->vm);default :return -EINVAL ; }include/uapi/drm/amdgpu_drm.h +1
-0@@ -223,6 +223,7 @@ union drm_amdgpu_ctx {/* vm ioctl */ #define AMDGPU_VM_OP_RESERVE_VMID 1#define AMDGPU_VM_OP_UNRESERVE_VMID 2 +#define AMDGPU_VM_OP_ENABLE_SVM 3
Quoted 2 lines
include/uapi/drm/amdgpu_drm.h union drm_amdgpu_ctx { · line 229
Quoted 2 lines
include/uapi/drm/amdgpu_drm.h +0
-0struct drm_amdgpu_vm_in {/** AMDGPU_VM_OP_* */
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
This is a very cool patch series. I made some specific comments on some of the patches. But overall this is great.
I guess your plan is to start testing the SVM programming model with ATC, and then enable the same programming model without the IOMMU using HMM. That means there could be working and validated tests to run on HMM.
I think 4.16 will get an IOMMUv2 driver that we worked on for Raven to support PPR on newer IOMMU versions. Without that the GPU is not able to make swapped or new pages resident or trigger a COW.
We're currently still working on one problem with Raven, related to the way GFX9 retries memory accesses. Many PPR requests for the same virtual address can be outstanding (in an IOMMU log buffer). After the first request is handled, the GPU can continue, but the remaining requests are still in the queue. This can result in the IOMMU driver trying to handle a PPR for a page that's already freed by the application, which triggers an invalid PPR callback.
An invalid PPR is like the GPU-equivalent of a segfault, and KFD implements it like that. With the above behaviour we end up segfaulting applications that didn't do anything wrong. I guess for your implementation it's not a problem because you don't implement that callback yet.
Regards,
Felix
Quoted 44 lines · Christian König
That got mixed up with the encode ring function.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +17
-1@@ -880,6 +880,22 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring,vcn_v1_0_dec_vm_reg_wait (ring, data0, data1, mask); } +static void vcn_v1_0_dec_ring_emit_wreg (struct amdgpu_ring *ring, +uint32_t reg,uint32_t val) +{ +struct amdgpu_device *adev = ring->adev; + +amdgpu_ring_write (ring, +PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA0),0 )); +amdgpu_ring_write (ring, reg <<2 ); +amdgpu_ring_write (ring, +PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA1),0 )); +amdgpu_ring_write (ring, val); +amdgpu_ring_write (ring, +PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_CMD),0 )); +amdgpu_ring_write (ring,VCN_DEC_CMD_WRITE_REG <<1 ); +} +/** * vcn_v1_0_enc_ring_get_rptr - get enc read pointer * @@ -1097,7 +1113,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .pad_ib = amdgpu_ring_generic_pad_ib, .begin_use = amdgpu_vcn_ring_begin_use, .end_use = amdgpu_vcn_ring_end_use, - .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, + .emit_wreg = vcn_v1_0_dec_ring_emit_wreg, };static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = {
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { · line 1146
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1
-0@@ -1124,6 +1140,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { .pad_ib = amdgpu_ring_generic_pad_ib, .begin_use = amdgpu_vcn_ring_begin_use, .end_use = amdgpu_vcn_ring_end_use, + .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, };static void vcn_v1_0_set_dec_ring_funcs (struct amdgpu_device *adev)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): ccb040a2-27cd-6ff6-45eb-5c81a108c99d-5C7GfCeVMHo@public.gmane.org
Am 30.01.2018 um 00:01 schrieb Felix Kuehling:
Quoted 2 lines
This is a very cool patch series. I made some specific comments on some of the patches. But overall this is great.
Thanks, going to comment on some of those on the patches.
Quoted 3 lines
I guess your plan is to start testing the SVM programming model with ATC, and then enable the same programming model without the IOMMU using HMM. That means there could be working and validated tests to run on HMM.
Yes, exactly. Well I think it would make implementing HMM much easier if we could rely on most of the mapping being done by the ATC instead of manually crafted GPUVM page tables.
Quoted 3 lines
I think 4.16 will get an IOMMUv2 driver that we worked on for Raven to support PPR on newer IOMMU versions. Without that the GPU is not able to make swapped or new pages resident or trigger a COW.
Uff? So the ATC is actually not able to handle page faults?
Quoted 8 lines
We're currently still working on one problem with Raven, related to the way GFX9 retries memory accesses. Many PPR requests for the same virtual address can be outstanding (in an IOMMU log buffer). After the first request is handled, the GPU can continue, but the remaining requests are still in the queue. This can result in the IOMMU driver trying to handle a PPR for a page that's already freed by the application, which triggers an invalid PPR callback.
Quoted 5 lines
An invalid PPR is like the GPU-equivalent of a segfault, and KFD implements it like that. With the above behaviour we end up segfaulting applications that didn't do anything wrong. I guess for your implementation it's not a problem because you don't implement that callback yet.
Yeah, that is exactly the same problem I'm currently running into with HMM.
The interrupt handling is pipelined (even much much more than the ATC path), so what can happen is that applications free up some memory but we have stale page faults for that page in the pipeline.
The only valid workaround I can see is to make sure interrupts are processed before returning to HMM that it can unmap pages, and that is a really show stopper for performance as far as I can see.
Regards,
Christian.
Quoted 56 lines
Regards,
FelixQuoted 50 lines · Christian König
That got mixed up with the encode ring function.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +18
-1@@ -880,6 +880,22 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring,vcn_v1_0_dec_vm_reg_wait (ring, data0, data1, mask); } +static void vcn_v1_0_dec_ring_emit_wreg (struct amdgpu_ring *ring, +uint32_t reg,uint32_t val) +{ +struct amdgpu_device *adev = ring->adev; + +amdgpu_ring_write (ring, +PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA0),0 )); +amdgpu_ring_write (ring, reg <<2 ); +amdgpu_ring_write (ring, +PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_DATA1),0 )); +amdgpu_ring_write (ring, val); +amdgpu_ring_write (ring, +PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GPCOM_VCPU_CMD),0 )); +amdgpu_ring_write (ring,VCN_DEC_CMD_WRITE_REG <<1 ); +} +/** * vcn_v1_0_enc_ring_get_rptr - get enc read pointer * @@ -1097,7 +1113,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .pad_ib = amdgpu_ring_generic_pad_ib, .begin_use = amdgpu_vcn_ring_begin_use, .end_use = amdgpu_vcn_ring_end_use, - .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, + .emit_wreg = vcn_v1_0_dec_ring_emit_wreg, };static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = {@@ -1124,6 +1140,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { .pad_ib = amdgpu_ring_generic_pad_ib, .begin_use = amdgpu_vcn_ring_begin_use, .end_use = amdgpu_vcn_ring_end_use, + .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, };
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { · line 1146
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +0
-0static void vcn_v1_0_set_dec_ring_funcs (struct amdgpu_device *adev)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 4701d758-29fe-5403-f6a6-7618bbea03d7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Quoted 11 lines · Christian König
Am 30.01.2018 um 00:01 schrieb Felix Kuehling:
Quoted 2 lines
This is a very cool patch series. I made some specific comments on some of the patches. But overall this is great.
Thanks, going to comment on some of those on the patches.
Quoted 4 lines
I guess your plan is to start testing the SVM programming model with ATC, and then enable the same programming model without the IOMMU using HMM. That means there could be working and validated tests to run on HMM.
Quoted 8 lines
Yes, exactly. Well I think it would make implementing HMM much easier if we could rely on most of the mapping being done by the ATC instead of manually crafted GPUVM page tables.
Quoted 3 lines
I think 4.16 will get an IOMMUv2 driver that we worked on for Raven to support PPR on newer IOMMU versions. Without that the GPU is not able to make swapped or new pages resident or trigger a COW.
Uff? So the ATC is actually not able to handle page faults?
It's supposed to. It worked on Carrizo. As I understand it, the new IOMMUv2 on Raven needs the driver to enable that feature per-device. That fix is coming in 4.16.
Quoted 18 lines
Quoted 9 lines
We're currently still working on one problem with Raven, related to the way GFX9 retries memory accesses. Many PPR requests for the same virtual address can be outstanding (in an IOMMU log buffer). After the first request is handled, the GPU can continue, but the remaining requests are still in the queue. This can result in the IOMMU driver trying to handle a PPR for a page that's already freed by the application, which triggers an invalid PPR callback.
Quoted 5 lines
An invalid PPR is like the GPU-equivalent of a segfault, and KFD implements it like that. With the above behaviour we end up segfaulting applications that didn't do anything wrong. I guess for your implementation it's not a problem because you don't implement that callback yet.
Yeah, that is exactly the same problem I'm currently running into with HMM.
Quoted 7 lines
The interrupt handling is pipelined (even much much more than the ATC path), so what can happen is that applications free up some memory but we have stale page faults for that page in the pipeline.
The only valid workaround I can see is to make sure interrupts are processed before returning to HMM that it can unmap pages, and that is a really show stopper for performance as far as I can see.
For ATC my idea is to use an invalidate_range_start MMU notifier to wait for pending PPRs to get processed before letting the kernel unmap pages. The underlying assumption is this: when an application frees memory, it must be sure it's not using that memory any more. So we don't expect any new faults for the address. We only need to wait for pending faults to flush out of the pipe.
For HMM I think the prescreen interrupt handler stage I added should help, so you only see one interrupt per faulting address. But you need to figure out the right moment to clear the fault after updating the page table.
Regards,
Felix
Quoted 55 lines
Regards,
Christian.Quoted 51 lines
Regards,
FelixQuoted 45 lines · Christian König
That got mixed up with the encode ring function.
Signed-off-by Christian König <[email protected]>---
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c| 19 ++++++++++++++++++-1 file changed, 18 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +15
-0@@ -880,6 +880,22 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring, vcn_v1_0_dec_vm_reg_wait(ring, data0, data1, mask); } +static void vcn_v1_0_dec_ring_emit_wreg(struct amdgpu_ring *ring, + uint32_t reg, uint32_t val) +{ + struct amdgpu_device *adev = ring->adev; + + amdgpu_ring_write(ring, + PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_DATA0), 0)); + amdgpu_ring_write(ring, reg << 2); + amdgpu_ring_write(ring, + PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_DATA1), 0)); + amdgpu_ring_write(ring, val); + amdgpu_ring_write(ring, + PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_CMD), 0)); + amdgpu_ring_write(ring, VCN_DEC_CMD_WRITE_REG << 1); +} + /*** vcn_v1_0_enc_ring_get_rptr - get enc read pointer *
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1
-1@@ -1097,7 +1113,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .pad_ib = amdgpu_ring_generic_pad_ib, .begin_use = amdgpu_vcn_ring_begin_use, .end_use = amdgpu_vcn_ring_end_use, - .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, + .emit_wreg = vcn_v1_0_dec_ring_emit_wreg, };static const struct
amdgpu_ring_funcsvcn_v1_0_enc_ring_vm_funcs= {
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c static const struct amdgpu_ring_funcs · line 1146
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1
-0@@ -1124,6 +1140,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { .pad_ib = amdgpu_ring_generic_pad_ib, .begin_use = amdgpu_vcn_ring_begin_use, .end_use = amdgpu_vcn_ring_end_use, + .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, }; static void vcn_v1_0_set_dec_ring_funcs(struct amdgpu_device *adev)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx