Skip to contentSkip to conversation

drm/amdgpu:impl vgt_flush for VI

PATCH In review Monk Liu 3 participants 7 messages Nov 11, 2016 – Nov 14, 2016 6 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Monk Liu

author
#0 lore raw

PATCH 1/1 drm/amdgpu:impl vgt_flush for VI

when hardware shadowing enabled, tesselation will trigger vm fault, the root cause is because VGT_FLUSH not introduced in kmd. this could fix tesselation crash issue.

Change-Id I77d87d93ce6580e559e734fb41d97ee8c59d245b
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h      |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c   |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  1 +
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c    | 13 +++++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
index 15015bc..f46e96b 100644
@@ -1630,6 +1630,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
 #define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))
 #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as))
 #define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))
+#define amdgpu_ring_emit_vgt_flush(r) (r)->funcs->emit_vgt_flush((r))
 #define amdgpu_ring_emit_hdp_invalidate(r) (r)->funcs->emit_hdp_invalidate((r))
 #define amdgpu_ring_emit_switch_buffer(r) (r)->funcs->emit_switch_buffer((r))
 #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d))
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +4 -1
index acf48de..c039890 100644
@@ -175,11 +175,14 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
 	if (ring->funcs->emit_hdp_flush)
 		amdgpu_ring_emit_hdp_flush(ring);
 
+	need_ctx_switch = ring->current_ctx != fence_ctx;
+	if (ring->funcs->emit_vgt_flush && need_ctx_switch)
+		 amdgpu_ring_emit_vgt_flush(ring);
+
 	/* always set cond_exec_polling to CONTINUE */
 	*ring->cond_exe_cpu_addr = 1;
 
 	skip_preamble = ring->current_ctx == fence_ctx;
-	need_ctx_switch = ring->current_ctx != fence_ctx;
 	if (job && ring->funcs->emit_cntxcntl) {
 		if (need_ctx_switch)
 			status |= AMDGPU_HAVE_CTX_SWITCH;
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
index 92bc89b..c3a7329 100644
@@ -116,6 +116,7 @@ struct amdgpu_ring_funcs {
 	void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id,
 			      uint64_t pd_addr);
 	void (*emit_hdp_flush)(struct amdgpu_ring *ring);
+	void (*emit_vgt_flush)(struct amdgpu_ring *ring);
 	void (*emit_hdp_invalidate)(struct amdgpu_ring *ring);
 	void (*emit_gds_switch)(struct amdgpu_ring *ring, uint32_t vmid,
 				uint32_t gds_base, uint32_t gds_size,
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +13 -0
index 9017803..1d407d76 100644
@@ -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));
@@ -6590,6 +6602,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
 	.pad_ib = amdgpu_ring_generic_pad_ib,
 	.emit_switch_buffer = gfx_v8_ring_emit_sb,
 	.emit_cntxcntl = gfx_v8_ring_emit_cntxcntl,
+	.emit_vgt_flush = gfx_v8_0_ring_emit_vgt_flush,
 };
 
 static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {
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): 1478860333-14270-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org

author
#2 lore raw

Anyone review this patch ?

This patch could fix tessellation bug when shadowing enabled, we should always insert vgt_flush when there is a context switch

BR Monk

-----邮件原件-----
发件人: Monk Liu [mailto:[email protected]]
发送时间: Friday, November 11, 2016 6:32 PM
收件人: [email protected]
抄送: Liu, Monk
主题: [PATCH] drm/amdgpu:impl vgt_flush for VI

when hardware shadowing enabled, tesselation will trigger vm fault, the root cause is because VGT_FLUSH not introduced in kmd. this could fix tesselation crash issue.

Change-Id I77d87d93ce6580e559e734fb41d97ee8c59d245b
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h      |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c   |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  1 +
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c    | 13 +++++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
index 15015bc..f46e96b 100644
@@ -1630,6 +1630,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)  #define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))  #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as))  #define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))
+#define amdgpu_ring_emit_vgt_flush(r) (r)->funcs->emit_vgt_flush((r))
 #define amdgpu_ring_emit_hdp_invalidate(r) (r)->funcs->emit_hdp_invalidate((r))
 #define amdgpu_ring_emit_switch_buffer(r) (r)->funcs->emit_switch_buffer((r))
 #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d)) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

index acf48de..c039890 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +4 -1
@@ -175,11 +175,14 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
 	if (ring->funcs->emit_hdp_flush)
 		amdgpu_ring_emit_hdp_flush(ring);
 
+	need_ctx_switch = ring->current_ctx != fence_ctx;
+	if (ring->funcs->emit_vgt_flush && need_ctx_switch)
+		 amdgpu_ring_emit_vgt_flush(ring);
+
 	/* always set cond_exec_polling to CONTINUE */
 	*ring->cond_exe_cpu_addr = 1;
 
 	skip_preamble = ring->current_ctx == fence_ctx;
-	need_ctx_switch = ring->current_ctx != fence_ctx;
 	if (job && ring->funcs->emit_cntxcntl) {
 		if (need_ctx_switch)
 			status |= AMDGPU_HAVE_CTX_SWITCH;
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
index 92bc89b..c3a7329 100644
@@ -116,6 +116,7 @@ struct amdgpu_ring_funcs {
 	void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id,
 			      uint64_t pd_addr);
 	void (*emit_hdp_flush)(struct amdgpu_ring *ring);
+	void (*emit_vgt_flush)(struct amdgpu_ring *ring);
 	void (*emit_hdp_invalidate)(struct amdgpu_ring *ring);
 	void (*emit_gds_switch)(struct amdgpu_ring *ring, uint32_t vmid,
 				uint32_t gds_base, uint32_t gds_size, diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

index 9017803..1d407d76 100644

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +11 -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)); @@ -6590,6 +6602,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
 	.pad_ib = amdgpu_ring_generic_pad_ib,
 	.emit_switch_buffer = gfx_v8_ring_emit_sb,

.emit_cntxcntl = gfx_v8_ring_emit_cntxcntl,
+ .emit_vgt_flush = gfx_v8_0_ring_emit_vgt_flush,
};

static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {
--
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): DM5PR12MB1355340239F3F20F50B3093E84BC0-2J9CzHegvk+AJwmwFrlwrgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#4 lore raw

Am 14.11.2016 um 04:17 schrieb Liu, Monk:

Quoted 1 line

Anyone review this patch ?

Looks good in general, but is there any reason not to put it into the existing emit_cntxcntl callback?

Regards,
Christian.

Quoted 92 lines

This patch could fix tessellation bug when shadowing enabled, we should always insert vgt_flush when there is a context switch

BR Monk

-----邮件原件-----
发件人: Monk Liu [mailto:[email protected]]
发送时间: Friday, November 11, 2016 6:32 PM
收件人: [email protected]
抄送: Liu, Monk
主题: [PATCH] drm/amdgpu:impl vgt_flush for VI

when hardware shadowing enabled, tesselation will trigger vm fault, the root cause is because VGT_FLUSH not introduced in kmd. this could fix tesselation crash issue.

Change-Id I77d87d93ce6580e559e734fb41d97ee8c59d245b
---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h      |  1 +
  drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c   |  5 ++++-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  1 +
  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c    | 13 +++++++++++++
  4 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
index 15015bc..f46e96b 100644
@@ -1630,6 +1630,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)  #define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))  #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as))  #define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))
+#define amdgpu_ring_emit_vgt_flush(r) (r)->funcs->emit_vgt_flush((r))
  #define amdgpu_ring_emit_hdp_invalidate(r) (r)->funcs->emit_hdp_invalidate((r))
  #define amdgpu_ring_emit_switch_buffer(r) (r)->funcs->emit_switch_buffer((r))
  #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d)) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

index acf48de..c039890 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +4 -1
@@ -175,11 +175,14 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
  	if (ring->funcs->emit_hdp_flush)
  		amdgpu_ring_emit_hdp_flush(ring);
 
+	need_ctx_switch = ring->current_ctx != fence_ctx;
+	if (ring->funcs->emit_vgt_flush && need_ctx_switch)
+		 amdgpu_ring_emit_vgt_flush(ring);
+
  	/* always set cond_exec_polling to CONTINUE */
  	*ring->cond_exe_cpu_addr = 1;
 
  	skip_preamble = ring->current_ctx == fence_ctx;
-	need_ctx_switch = ring->current_ctx != fence_ctx;
  	if (job && ring->funcs->emit_cntxcntl) {
  		if (need_ctx_switch)
  			status |= AMDGPU_HAVE_CTX_SWITCH;
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
index 92bc89b..c3a7329 100644
@@ -116,6 +116,7 @@ struct amdgpu_ring_funcs {
  	void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id,
  			      uint64_t pd_addr);
  	void (*emit_hdp_flush)(struct amdgpu_ring *ring);
+	void (*emit_vgt_flush)(struct amdgpu_ring *ring);
  	void (*emit_hdp_invalidate)(struct amdgpu_ring *ring);
  	void (*emit_gds_switch)(struct amdgpu_ring *ring, uint32_t vmid,
  				uint32_t gds_base, uint32_t gds_size, diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

index 9017803..1d407d76 100644

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +12 -1
@@ -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)); @@ -6590,6 +6602,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
  	.pad_ib = amdgpu_ring_generic_pad_ib,
  	.emit_switch_buffer = gfx_v8_ring_emit_sb,
  	.emit_cntxcntl = gfx_v8_ring_emit_cntxcntl,
+	.emit_vgt_flush = gfx_v8_0_ring_emit_vgt_flush,
  };
 
  static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {
--

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

A message that is not in the archive (sent off-list or not yet received): 32010a55-aa4d-7aff-5f42-4a6081f96b56-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

author
#6 lore raw

Although the effect is equal, but cntxcntl uses CONTEXT_CONTROL only, while vgt-flush uses EVENT_WRITE on vgt_flush and vs_partial_flush only, And vgt flush only operate on tessellation category registers, I'd prefer it not mixed with CONTEXT_CONTROL package ... I think Put them together seems not grace ...

BR Monk

-----邮件原件-----
发件人: Christian König [mailto:[email protected]] 发送时间: Monday, November 14, 2016 5:46 PM
收件人: Liu, Monk; [email protected]
主题: Re: 答复: [PATCH] drm/amdgpu:impl vgt_flush for VI

Am 14.11.2016 um 04:17 schrieb Liu, Monk:

Quoted 1 line

Anyone review this patch ?

Looks good in general, but is there any reason not to put it into the existing emit_cntxcntl callback?

Regards,
Christian.

Quoted 107 lines

This patch could fix tessellation bug when shadowing enabled, we should always insert vgt_flush when there is a context switch

BR Monk

-----邮件原件-----
发件人: Monk Liu [mailto:[email protected]]
发送时间: Friday, November 11, 2016 6:32 PM
收件人: [email protected]
抄送: Liu, Monk
主题: [PATCH] drm/amdgpu:impl vgt_flush for VI

when hardware shadowing enabled, tesselation will trigger vm fault, the root cause is because VGT_FLUSH not introduced in kmd. this could fix tesselation crash issue.

Change-Id I77d87d93ce6580e559e734fb41d97ee8c59d245b
---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h      |  1 +
  drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c   |  5 ++++-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  1 +
  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c    | 13 +++++++++++++
  4 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
index 15015bc..f46e96b 100644
@@ -1630,6 +1630,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring 
 *ring)  #define amdgpu_ring_emit_fence(r, addr, seq, flags) 

(r)->funcs->emit_fence((r), (addr), (seq), (flags)) #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) #define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))
+#define amdgpu_ring_emit_vgt_flush(r) (r)->funcs->emit_vgt_flush((r))
#define amdgpu_ring_emit_hdp_invalidate(r) (r)->funcs->emit_hdp_invalidate((r)) #define amdgpu_ring_emit_switch_buffer(r) (r)->funcs->emit_switch_buffer((r)) #define amdgpu_ring_emit_cntxcntl(r, d)
(r)->funcs->emit_cntxcntl((r), (d)) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index acf48de..c039890 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +4 -1
@@ -175,11 +175,14 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
  	if (ring->funcs->emit_hdp_flush)
  		amdgpu_ring_emit_hdp_flush(ring);
 
+	need_ctx_switch = ring->current_ctx != fence_ctx;
+	if (ring->funcs->emit_vgt_flush && need_ctx_switch)
+		 amdgpu_ring_emit_vgt_flush(ring);
+
  	/* always set cond_exec_polling to CONTINUE */
  	*ring->cond_exe_cpu_addr = 1;
 
  	skip_preamble = ring->current_ctx == fence_ctx;
-	need_ctx_switch = ring->current_ctx != fence_ctx;
  	if (job && ring->funcs->emit_cntxcntl) {
  		if (need_ctx_switch)
  			status |= AMDGPU_HAVE_CTX_SWITCH; diff --git 

a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
index 92bc89b..c3a7329 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -116,6 +116,7 @@ struct amdgpu_ring_funcs {
  	void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id,
  			      uint64_t pd_addr);
  	void (*emit_hdp_flush)(struct amdgpu_ring *ring);
+	void (*emit_vgt_flush)(struct amdgpu_ring *ring);
  	void (*emit_hdp_invalidate)(struct amdgpu_ring *ring);
  	void (*emit_gds_switch)(struct amdgpu_ring *ring, uint32_t vmid,
  				uint32_t gds_base, uint32_t gds_size, diff --git 

a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 9017803..1d407d76 100644

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)); @@ -6590,6 +6602,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
  	.pad_ib = amdgpu_ring_generic_pad_ib,
  	.emit_switch_buffer = gfx_v8_ring_emit_sb,
  	.emit_cntxcntl = gfx_v8_ring_emit_cntxcntl,
+	.emit_vgt_flush = gfx_v8_0_ring_emit_vgt_flush,
  };
 
  static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = 

{
--
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

A message that is not in the archive (sent off-list or not yet received): DM5PR12MB1355412B041FD1D0B40E16FA84BC0-2J9CzHegvk+AJwmwFrlwrgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#8 lore raw

The callbacks are use case driven, so it doesn't matter what packets they use. I would really prefer not to add to many of them.

Maybe rename the emit_cntxcntl callback to just emit_context_preamble or something like this to make it more clear what that is good for.

Regards,
Christian.

Am 14.11.2016 um 11:01 schrieb Liu, Monk:

Quoted 125 lines

Although the effect is equal, but cntxcntl uses CONTEXT_CONTROL only, while vgt-flush uses EVENT_WRITE on vgt_flush and vs_partial_flush only, And vgt flush only operate on tessellation category registers, I'd prefer it not mixed with CONTEXT_CONTROL package ... I think Put them together seems not grace ...

BR Monk

-----邮件原件-----
发件人: Christian König [mailto:[email protected]] 发送时间: Monday, November 14, 2016 5:46 PM
收件人: Liu, Monk; [email protected]
主题: Re: 答复: [PATCH] drm/amdgpu:impl vgt_flush for VI

Am 14.11.2016 um 04:17 schrieb Liu, Monk:

Quoted 1 line

Anyone review this patch ?

Looks good in general, but is there any reason not to put it into the existing emit_cntxcntl callback?

Regards,
Christian.

Quoted 106 lines

This patch could fix tessellation bug when shadowing enabled, we should always insert vgt_flush when there is a context switch

BR Monk

-----邮件原件-----
发件人: Monk Liu [mailto:[email protected]]
发送时间: Friday, November 11, 2016 6:32 PM
收件人: [email protected]
抄送: Liu, Monk
主题: [PATCH] drm/amdgpu:impl vgt_flush for VI

when hardware shadowing enabled, tesselation will trigger vm fault, the root cause is because VGT_FLUSH not introduced in kmd. this could fix tesselation crash issue.

Change-Id I77d87d93ce6580e559e734fb41d97ee8c59d245b
---
   drivers/gpu/drm/amd/amdgpu/amdgpu.h      |  1 +
   drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c   |  5 ++++-
   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  1 +
   drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c    | 13 +++++++++++++
   4 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
index 15015bc..f46e96b 100644
@@ -1630,6 +1630,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring
 *ring)  #define amdgpu_ring_emit_fence(r, addr, seq, flags)

(r)->funcs->emit_fence((r), (addr), (seq), (flags)) #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) #define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))
+#define amdgpu_ring_emit_vgt_flush(r) (r)->funcs->emit_vgt_flush((r))

   #define amdgpu_ring_emit_hdp_invalidate(r) (r)->funcs->emit_hdp_invalidate((r))
   #define amdgpu_ring_emit_switch_buffer(r) (r)->funcs->emit_switch_buffer((r))
   #define amdgpu_ring_emit_cntxcntl(r, d)

(r)->funcs->emit_cntxcntl((r), (d)) diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index acf48de..c039890 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +4 -1
@@ -175,11 +175,14 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
   	if (ring->funcs->emit_hdp_flush)
   		amdgpu_ring_emit_hdp_flush(ring);
 
+	need_ctx_switch = ring->current_ctx != fence_ctx;
+	if (ring->funcs->emit_vgt_flush && need_ctx_switch)
+		 amdgpu_ring_emit_vgt_flush(ring);
+
   	/* always set cond_exec_polling to CONTINUE */
   	*ring->cond_exe_cpu_addr = 1;
 
   	skip_preamble = ring->current_ctx == fence_ctx;
-	need_ctx_switch = ring->current_ctx != fence_ctx;
   	if (job && ring->funcs->emit_cntxcntl) {
   		if (need_ctx_switch)
   			status |= AMDGPU_HAVE_CTX_SWITCH; diff --git

a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
index 92bc89b..c3a7329 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -116,6 +116,7 @@ struct amdgpu_ring_funcs {
   	void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id,
   			      uint64_t pd_addr);
   	void (*emit_hdp_flush)(struct amdgpu_ring *ring);
+	void (*emit_vgt_flush)(struct amdgpu_ring *ring);
   	void (*emit_hdp_invalidate)(struct amdgpu_ring *ring);
   	void (*emit_gds_switch)(struct amdgpu_ring *ring, uint32_t vmid,
   				uint32_t gds_base, uint32_t gds_size, diff --git

a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 9017803..1d407d76 100644

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)); @@ -6590,6 +6602,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
   	.pad_ib = amdgpu_ring_generic_pad_ib,
   	.emit_switch_buffer = gfx_v8_ring_emit_sb,
   	.emit_cntxcntl = gfx_v8_ring_emit_cntxcntl,
+	.emit_vgt_flush = gfx_v8_0_ring_emit_vgt_flush,
   };
 
   static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute =

{
--
1.9.1

Quoted 5 lines
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

A message that is not in the archive (sent off-list or not yet received): ddae0dc9-7b1a-6092-b11a-f66e760afe19-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

author
#10 lore raw

I have no strong opinion, I checked windows kmd and they separate vgt-flush and cntx-ctrl as well, Fine with your suggestion

BR Monk

-----邮件原件-----
发件人: Christian König [mailto:[email protected]] 发送时间: Monday, November 14, 2016 7:33 PM
收件人: Liu, Monk; [email protected]
主题: Re: 答复: 答复: [PATCH] drm/amdgpu:impl vgt_flush for VI

The callbacks are use case driven, so it doesn't matter what packets they use. I would really prefer not to add to many of them.

Maybe rename the emit_cntxcntl callback to just emit_context_preamble or something like this to make it more clear what that is good for.

Regards,
Christian.

Am 14.11.2016 um 11:01 schrieb Liu, Monk:

Quoted 126 lines

Although the effect is equal, but cntxcntl uses CONTEXT_CONTROL only,
while vgt-flush uses EVENT_WRITE on vgt_flush and vs_partial_flush only, And vgt flush only operate on tessellation category registers, I'd prefer it not mixed with CONTEXT_CONTROL package ... I think Put them together seems not grace ...

BR Monk

-----邮件原件-----
发件人: Christian König [mailto:[email protected]] 发送时间: Monday, November 14, 2016 5:46 PM
收件人: Liu, Monk; [email protected]
主题: Re: 答复: [PATCH] drm/amdgpu:impl vgt_flush for VI

Am 14.11.2016 um 04:17 schrieb Liu, Monk:

Quoted 1 line

Anyone review this patch ?

Looks good in general, but is there any reason not to put it into the existing emit_cntxcntl callback?

Regards,
Christian.

Quoted 107 lines

This patch could fix tessellation bug when shadowing enabled, we should always insert vgt_flush when there is a context switch

BR Monk

-----邮件原件-----
发件人: Monk Liu [mailto:[email protected]]
发送时间: Friday, November 11, 2016 6:32 PM
收件人: [email protected]
抄送: Liu, Monk
主题: [PATCH] drm/amdgpu:impl vgt_flush for VI

when hardware shadowing enabled, tesselation will trigger vm fault, the root cause is because VGT_FLUSH not introduced in kmd. this could fix tesselation crash issue.

Change-Id I77d87d93ce6580e559e734fb41d97ee8c59d245b
---
   drivers/gpu/drm/amd/amdgpu/amdgpu.h      |  1 +
   drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c   |  5 ++++-
   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  1 +
   drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c    | 13 +++++++++++++
   4 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
index 15015bc..f46e96b 100644
@@ -1630,6 +1630,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring
 *ring)  #define amdgpu_ring_emit_fence(r, addr, seq, flags) 

(r)->funcs->emit_fence((r), (addr), (seq), (flags)) #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) #define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))

drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
+#define amdgpu_ring_emit_vgt_flush(r) 
+(r)->funcs->emit_vgt_flush((r))
   #define amdgpu_ring_emit_hdp_invalidate(r) (r)->funcs->emit_hdp_invalidate((r))
   #define amdgpu_ring_emit_switch_buffer(r) (r)->funcs->emit_switch_buffer((r))
   #define amdgpu_ring_emit_cntxcntl(r, d) 

(r)->funcs->emit_cntxcntl((r), (d)) diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index acf48de..c039890 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +4 -1
@@ -175,11 +175,14 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
   	if (ring->funcs->emit_hdp_flush)
   		amdgpu_ring_emit_hdp_flush(ring);
 
+	need_ctx_switch = ring->current_ctx != fence_ctx;
+	if (ring->funcs->emit_vgt_flush && need_ctx_switch)
+		 amdgpu_ring_emit_vgt_flush(ring);
+
   	/* always set cond_exec_polling to CONTINUE */
   	*ring->cond_exe_cpu_addr = 1;
 
   	skip_preamble = ring->current_ctx == fence_ctx;
-	need_ctx_switch = ring->current_ctx != fence_ctx;
   	if (job && ring->funcs->emit_cntxcntl) {
   		if (need_ctx_switch)
   			status |= AMDGPU_HAVE_CTX_SWITCH; diff --git 

a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
index 92bc89b..c3a7329 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -116,6 +116,7 @@ struct amdgpu_ring_funcs {
   	void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id,
   			      uint64_t pd_addr);
   	void (*emit_hdp_flush)(struct amdgpu_ring *ring);
+	void (*emit_vgt_flush)(struct amdgpu_ring *ring);
   	void (*emit_hdp_invalidate)(struct amdgpu_ring *ring);
   	void (*emit_gds_switch)(struct amdgpu_ring *ring, uint32_t vmid,
   				uint32_t gds_base, uint32_t gds_size, diff --git 

a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 9017803..1d407d76 100644

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)); @@ -6590,6 +6602,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
   	.pad_ib = amdgpu_ring_generic_pad_ib,
   	.emit_switch_buffer = gfx_v8_ring_emit_sb,
   	.emit_cntxcntl = gfx_v8_ring_emit_cntxcntl,
+	.emit_vgt_flush = gfx_v8_0_ring_emit_vgt_flush,
   };
 
   static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute 

= {
--
1.9.1

Quoted 5 lines
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

A message that is not in the archive (sent off-list or not yet received): DM5PR12MB13554FD685656621B92C043184BC0-2J9CzHegvk+AJwmwFrlwrgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#12 lore raw
Quoted 10 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Liu, Monk
Sent: Monday, November 14, 2016 6:40 AM
To: Christian König; [email protected]
Subject: 答复: 答复: 答复: [PATCH] drm/amdgpu:impl vgt_flush for VI

I have no strong opinion, I checked windows kmd and they separate vgt- flush and cntx-ctrl as well,
Fine with your suggestion

Please also make sure you update the packet counts in the ring structure.

Alex

Quoted 165 lines

BR Monk

-----邮件原件-----
发件人: Christian König [mailto:[email protected]] 发送时间: Monday, November 14, 2016 7:33 PM
收件人: Liu, Monk; [email protected]
主题: Re: 答复: 答复: [PATCH] drm/amdgpu:impl vgt_flush for VI

The callbacks are use case driven, so it doesn't matter what packets they use. I would really prefer not to add to many of them.

Maybe rename the emit_cntxcntl callback to just emit_context_preamble or something like this to make it more clear what that is good for.

Regards,
Christian.

Am 14.11.2016 um 11:01 schrieb Liu, Monk:

Quoted 2 lines

Although the effect is equal, but cntxcntl uses CONTEXT_CONTROL only, while vgt-flush uses EVENT_WRITE on vgt_flush and vs_partial_flush only,

And vgt flush only operate on tessellation category registers, I'd prefer it not mixed with CONTEXT_CONTROL package ...

Quoted 10 lines

I think Put them together seems not grace ...

BR Monk

-----邮件原件-----
发件人: Christian König [mailto:[email protected]] 发送时间: Monday, November 14, 2016 5:46 PM
收件人: Liu, Monk; [email protected]
主题: Re: 答复: [PATCH] drm/amdgpu:impl vgt_flush for VI

Quoted 3 lines

Am 14.11.2016 um 04:17 schrieb Liu, Monk:

Quoted 1 line

Anyone review this patch ?

Looks good in general, but is there any reason not to put it into the existing

emit_cntxcntl callback?

Quoted 17 lines

Regards,
Christian.

Quoted 13 lines

This patch could fix tessellation bug when shadowing enabled, we should always insert vgt_flush when there is a context switch

BR Monk

-----邮件原件-----
发件人: Monk Liu [mailto:[email protected]]
发送时间: Friday, November 11, 2016 6:32 PM
收件人: [email protected]
抄送: Liu, Monk
主题: [PATCH] drm/amdgpu:impl vgt_flush for VI

when hardware shadowing enabled, tesselation will trigger vm fault, the

root cause is because VGT_FLUSH not introduced in kmd. this could fix tesselation crash issue.

Quoted 10 lines
Quoted 10 lines
Change-Id I77d87d93ce6580e559e734fb41d97ee8c59d245b
---
   drivers/gpu/drm/amd/amdgpu/amdgpu.h      |  1 +
   drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c   |  5 ++++-
   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  1 +
   drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c    | 13 +++++++++++++
   4 files changed, 19 insertions(+), 1 deletion(-)
Quoted 6 lines

drivers/gpu/drm/amd/amdgpu/amdgpu.h amdgpu_get_sdma_instance(struct

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
index 15015bc..f46e96b 100644
@@ -1630,6 +1630,7 @@ amdgpu_get_sdma_instance(struct

amdgpu_ring

Quoted 12 lines

drivers/gpu/drm/amd/amdgpu/amdgpu.h

Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
 *ring)  #define amdgpu_ring_emit_fence(r, addr, seq, flags)

(r)->funcs->emit_fence((r), (addr), (seq), (flags)) #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as)) #define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))

drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
+#define amdgpu_ring_emit_vgt_flush(r)
+(r)->funcs->emit_vgt_flush((r))
   #define amdgpu_ring_emit_hdp_invalidate(r) (r)->funcs-

emit_hdp_invalidate((r))

Quoted 1 line
   #define amdgpu_ring_emit_switch_buffer(r) (r)->funcs-

emit_switch_buffer((r))

Quoted 8 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c int amdgpu_ib_schedule(struct amdgpu_ring

Quoted 8 lines
   #define amdgpu_ring_emit_cntxcntl(r, d)

(r)->funcs->emit_cntxcntl((r), (d)) diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index acf48de..c039890 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +0 -0
@@ -175,11 +175,14 @@ int amdgpu_ib_schedule(struct amdgpu_ring

*ring, unsigned num_ibs,

Quoted 20 lines
Quoted 20 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +4 -1
   	if (ring->funcs->emit_hdp_flush)
   		amdgpu_ring_emit_hdp_flush(ring);
 
+	need_ctx_switch = ring->current_ctx != fence_ctx;
+	if (ring->funcs->emit_vgt_flush && need_ctx_switch)
+		 amdgpu_ring_emit_vgt_flush(ring);
+
   	/* always set cond_exec_polling to CONTINUE */
   	*ring->cond_exe_cpu_addr = 1;
 
   	skip_preamble = ring->current_ctx == fence_ctx;
-	need_ctx_switch = ring->current_ctx != fence_ctx;
   	if (job && ring->funcs->emit_cntxcntl) {
   		if (need_ctx_switch)
   			status |= AMDGPU_HAVE_CTX_SWITCH; diff --git

a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
index 92bc89b..c3a7329 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +0 -0
Quoted 8 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h struct amdgpu_ring_funcs { · line 122

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -116,6 +116,7 @@ struct amdgpu_ring_funcs {
   	void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vm_id,
   			      uint64_t pd_addr);
   	void (*emit_hdp_flush)(struct amdgpu_ring *ring);
+	void (*emit_vgt_flush)(struct amdgpu_ring *ring);
   	void (*emit_hdp_invalidate)(struct amdgpu_ring *ring);
   	void (*emit_gds_switch)(struct amdgpu_ring *ring, uint32_t vmid,
   				uint32_t gds_base, uint32_t gds_size, diff --

git

Quoted 6 lines

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static void

Quoted 6 lines

a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 9017803..1d407d76 100644

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0 -0
@@ -6187,6 +6187,18 @@ static void

gfx_v8_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)

Quoted 14 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2 -0
   	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));

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static void · line 6200

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +9 -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) {

Quoted 1 line

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static void · line 6201

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0 -0
   	amdgpu_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3)); @@

-6590,6 +6602,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {

Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1 -0
   	.pad_ib = amdgpu_ring_generic_pad_ib,
   	.emit_switch_buffer = gfx_v8_ring_emit_sb,
   	.emit_cntxcntl = gfx_v8_ring_emit_cntxcntl,
+	.emit_vgt_flush = gfx_v8_0_ring_emit_vgt_flush,
   };
 
   static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute

= {
--
1.9.1

Quoted 5 lines
Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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