drm/amdgpu:impl vgt_flush for VI(V3)
Subsystems (2)
PATCH 1/1 drm/amdgpu:impl vgt_flush for VI(V3)
when shadowing enabled, tesselation app will trigger vm fault because below three tesselation registers:
VGT_TF_RING_SIZE__CI__VI,VGT_HS_OFFCHIP_PARAM__CI__VI,VGT_TF_MEMORY_BASE__CI__VI,
need to be programed after vgt-flush.
Tesselation picture vm fault disappeared after vgt-flush introduced.
v2:implement vgt-flush for CI & SI.
v3:move vgt flush inside of cntx_cntrl
--- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 9 +++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 13 +++++++++++++ 3 files changed, 35 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +9 -0
@@ -1463,6 +1463,13 @@ static void gfx_v6_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)amdgpu_ring_write (ring,0x1 ); } +static void gfx_v6_0_ring_emit_vgt_flush (struct amdgpu_ring *ring) +{ +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VGT_FLUSH ) | +EVENT_INDEX (0 )); +} +/** * gfx_v6_0_ring_emit_hdp_invalidate - emit an hdp invalidate on the cp *
@@ -2802,6 +2809,8 @@ static uint64_t gfx_v6_0_get_gpu_clock_counter(struct amdgpu_device *adev)static void gfx_v6_ring_emit_cntxcntl (struct amdgpu_ring *ring,uint32_t flags) { +if (flags &AMDGPU_HAVE_CTX_SWITCH ) { +gfx_v6_0_ring_emit_vgt_flush (ring);amdgpu_ring_write (ring,PACKET3 (PACKET3_CONTEXT_CONTROL ,1 ));amdgpu_ring_write (ring,0x80000000 );amdgpu_ring_write (ring,0 );
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +13 -0
@@ -2105,6 +2105,18 @@ static void gfx_v7_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)amdgpu_ring_write (ring,0x20 );/* poll interval */ } +static void gfx_v7_0_ring_emit_vgt_flush (struct amdgpu_ring *ring) +{ +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VS_PARTIAL_FLUSH ) | +EVENT_INDEX (4 )); + +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VGT_FLUSH ) | +EVENT_INDEX (0 )); +} + +/** * gfx_v7_0_ring_emit_hdp_invalidate - emit an hdp invalidate on the cp *
@@ -2260,6 +2272,7 @@ static void gfx_v7_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags) dw2 |=0x80000000 ;/* set load_enable otherwise this package is just NOPs */ if (flags &AMDGPU_HAVE_CTX_SWITCH ) { +gfx_v7_0_ring_emit_vgt_flush (ring);/* set load_global_config & load_global_uconfig */ dw2 |=0x8001 ;/* set load_cs_sh_regs */
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +13 -0
@@ -6187,6 +6187,18 @@ static void gfx_v8_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)amdgpu_ring_write (ring,0x20 );/* poll interval */ } +static void gfx_v8_0_ring_emit_vgt_flush (struct amdgpu_ring *ring) +{ +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VS_PARTIAL_FLUSH ) | +EVENT_INDEX (4 )); + +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VGT_FLUSH ) | +EVENT_INDEX (0 )); +} + +static void gfx_v8_0_ring_emit_hdp_invalidate (struct amdgpu_ring *ring) {amdgpu_ring_write (ring,PACKET3 (PACKET3_WRITE_DATA ,3 ));
@@ -6372,6 +6384,7 @@ static void gfx_v8_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags) dw2 |=0x80000000 ;/* set load_enable otherwise this package is just NOPs */ if (flags &AMDGPU_HAVE_CTX_SWITCH ) { +gfx_v8_0_ring_emit_vgt_flush (ring);/* set load_global_config & load_global_uconfig */ dw2 |=0x8001 ;/* set load_cs_sh_regs */
Signature · 6 lines
1.9.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): 1479127939-17570-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org
Am 14.11.2016 um 13:52 schrieb Monk Liu:
Quoted 9 lines
when shadowing enabled, tesselation app will trigger vm fault because below three tesselation registers:
VGT_TF_RING_SIZE__CI__VI,VGT_HS_OFFCHIP_PARAM__CI__VI,VGT_TF_MEMORY_BASE__CI__VI,need to be programed after vgt-flush.
Quoted 8 lines
Tesselation picture vm fault disappeared after vgt-flush introduced.
v2:implement vgt-flush for CI & SI.
v3:move vgt flush inside ofcntx_cntrlChange-Id I77d87d93ce6580e559e734fb41d97ee8c59d245bSigned-off-by Monk Liu <[email protected]>
We also need to increase the DW estimation for the three gfx engines.
With that fixed the patch is Reviewed-by: Christian König <[email protected]>.
Quoted 88 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 9 +++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 13 +++++++++++++ 3 files changed, 35 insertions(+)drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +9
-0@@ -1463,6 +1463,13 @@ static void gfx_v6_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)amdgpu_ring_write (ring,0x1 ); } +static void gfx_v6_0_ring_emit_vgt_flush (struct amdgpu_ring *ring) +{ +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VGT_FLUSH ) | +EVENT_INDEX (0 )); +} +/** * gfx_v6_0_ring_emit_hdp_invalidate - emit an hdp invalidate on the cp * @@ -2802,6 +2809,8 @@ static uint64_t gfx_v6_0_get_gpu_clock_counter(struct amdgpu_device *adev)static void gfx_v6_ring_emit_cntxcntl (struct amdgpu_ring *ring,uint32_t flags) { +if (flags &AMDGPU_HAVE_CTX_SWITCH ) { +gfx_v6_0_ring_emit_vgt_flush (ring);amdgpu_ring_write (ring,PACKET3 (PACKET3_CONTEXT_CONTROL ,1 ));amdgpu_ring_write (ring,0x80000000 );amdgpu_ring_write (ring,0 );drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +13
-0@@ -2105,6 +2105,18 @@ static void gfx_v7_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)amdgpu_ring_write (ring,0x20 );/* poll interval */ } +static void gfx_v7_0_ring_emit_vgt_flush (struct amdgpu_ring *ring) +{ +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VS_PARTIAL_FLUSH ) | +EVENT_INDEX (4 )); + +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VGT_FLUSH ) | +EVENT_INDEX (0 )); +} + +/** * gfx_v7_0_ring_emit_hdp_invalidate - emit an hdp invalidate on the cp * @@ -2260,6 +2272,7 @@ static void gfx_v7_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags) dw2 |=0x80000000 ;/* set load_enable otherwise this package is just NOPs */ if (flags &AMDGPU_HAVE_CTX_SWITCH ) { +gfx_v7_0_ring_emit_vgt_flush (ring);/* set load_global_config & load_global_uconfig */ dw2 |=0x8001 ;/* set load_cs_sh_regs */ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +12
-0@@ -6187,6 +6187,18 @@ static void gfx_v8_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)amdgpu_ring_write (ring,0x20 );/* poll interval */ } +static void gfx_v8_0_ring_emit_vgt_flush (struct amdgpu_ring *ring) +{ +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VS_PARTIAL_FLUSH ) | +EVENT_INDEX (4 )); + +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VGT_FLUSH ) | +EVENT_INDEX (0 )); +} + +static void gfx_v8_0_ring_emit_hdp_invalidate (struct amdgpu_ring *ring) {amdgpu_ring_write (ring,PACKET3 (PACKET3_WRITE_DATA ,3 ));
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static void gfx_v8_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags) · line 6390
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1
-0@@ -6372,6 +6384,7 @@ static void gfx_v8_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags) dw2 |=0x80000000 ;/* set load_enable otherwise this package is just NOPs */ if (flags &AMDGPU_HAVE_CTX_SWITCH ) { +gfx_v8_0_ring_emit_vgt_flush (ring);/* set load_global_config & load_global_uconfig */ dw2 |=0x8001 ;/* set load_cs_sh_regs */
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 17 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Monk Liu
Sent: Monday, November 14, 2016 7:52 AM
To: [email protected]
Cc: Liu, Monk
Subject: [PATCH] drm/amdgpu:implvgt_flushfor VI(V3)when shadowing enabled, tesselation app will trigger vm fault because below three tesselation registers:
VGT_TF_RING_SIZE__CI__VI,VGT_HS_OFFCHIP_PARAM__CI__VI,VGT_TF_MEMORY_BASE__CI__VI,need to be programed after vgt-flush.
Quoted 8 lines
Tesselation picture vm fault disappeared after vgt-flush introduced.
v2:implement vgt-flush for CI & SI.
v3:move vgt flush inside ofcntx_cntrlChange-Id I77d87d93ce6580e559e734fb41d97ee8c59d245bSigned-off-by Monk Liu <[email protected]>
With the count sizes updated in the ring structures, this patch is:
Quoted 111 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 9 +++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 13 +++++++++++++ 3 files changed, 35 insertions(+)drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +7
-0@@ -1463,6 +1463,13 @@ static void gfx_v6_0_ring_emit_hdp_flush(struct amdgpu_ring *ring) amdgpu_ring_write(ring, 0x1); } +static void gfx_v6_0_ring_emit_vgt_flush (struct amdgpu_ring *ring) +{ +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VGT_FLUSH ) | +EVENT_INDEX (0 )); +} +/** * gfx_v6_0_ring_emit_hdp_invalidate - emit an hdp invalidate on the cp *
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2
-0@@ -2802,6 +2809,8 @@ static uint64_t gfx_v6_0_get_gpu_clock_counter(struct amdgpu_device *adev) static void gfx_v6_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags) { +if (flags &AMDGPU_HAVE_CTX_SWITCH ) { +gfx_v6_0_ring_emit_vgt_flush (ring); amdgpu_ring_write(ring, PACKET3(PACKET3_CONTEXT_CONTROL,1));
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0
-0amdgpu_ring_write (ring,0x80000000 );amdgpu_ring_write (ring,0 );drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +12
-0@@ -2105,6 +2105,18 @@ static void gfx_v7_0_ring_emit_hdp_flush(struct amdgpu_ring *ring) amdgpu_ring_write(ring, 0x20); /* poll interval */ } +static void gfx_v7_0_ring_emit_vgt_flush (struct amdgpu_ring *ring) +{ +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VS_PARTIAL_FLUSH ) | +EVENT_INDEX (4 )); + +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VGT_FLUSH ) | +EVENT_INDEX (0 )); +} + +/** * gfx_v7_0_ring_emit_hdp_invalidate - emit an hdp invalidate on the cp *
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +0
-0@@ -2260,6 +2272,7 @@ static void gfx_v7_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags) dw2 |= 0x80000000; /* set load_enable otherwise this package is justNOPs */
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +1
-0if (flags &AMDGPU_HAVE_CTX_SWITCH ) { +gfx_v7_0_ring_emit_vgt_flush (ring);/* set load_global_config & load_global_uconfig */ dw2 |=0x8001 ;/* set load_cs_sh_regs */ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +12
-0@@ -6187,6 +6187,18 @@ static void gfx_v8_0_ring_emit_hdp_flush(struct amdgpu_ring *ring) amdgpu_ring_write(ring, 0x20); /* poll interval */ } +static void gfx_v8_0_ring_emit_vgt_flush (struct amdgpu_ring *ring) +{ +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VS_PARTIAL_FLUSH ) | +EVENT_INDEX (4 )); + +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE ,0 )); +amdgpu_ring_write (ring,EVENT_TYPE (VGT_FLUSH ) | +EVENT_INDEX (0 )); +} + +static void gfx_v8_0_ring_emit_hdp_invalidate (struct amdgpu_ring *ring) {drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0
-0amdgpu_ring_write (ring,PACKET3 (PACKET3_WRITE_DATA ,3 ));@@ -6372,6 +6384,7 @@ static void gfx_v8_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags) dw2 |= 0x80000000; /* set load_enable otherwise this package is justNOPs */
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1
-1if (flags &AMDGPU_HAVE_CTX_SWITCH ) { +gfx_v8_0_ring_emit_vgt_flush (ring);/* set load_global_config & load_global_uconfig */ dw2 |=0x8001 ;/* set load_cs_sh_regs */ --1.9.1
Quoted 4 lines
_______________________________________________
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