Mesa (master): radeonsi: don't use PFP_SYNC_ME with compute-only contexts

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7be26976b8e8bc34fa7d55550014197ed2af488f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7be26976b8e8bc34fa7d55550014197ed2af488f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Apr  1 12:29:43 2019 -0400

radeonsi: don't use PFP_SYNC_ME with compute-only contexts

Compute rings don't have PFP.

Fixes: a1378639ab1 "radeonsi: always use compute rings for clover on CI and newer (v2)"

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Tested-by: Jan Vesely <jan.vesely at rutgers.edu>
Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>

---

 src/gallium/drivers/radeonsi/si_cp_dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c
index 5993369d2da..f349325202c 100644
--- a/src/gallium/drivers/radeonsi/si_cp_dma.c
+++ b/src/gallium/drivers/radeonsi/si_cp_dma.c
@@ -131,7 +131,7 @@ static void si_emit_cp_dma(struct si_context *sctx, struct radeon_cmdbuf *cs,
 	 * indices. If we wanted to execute CP DMA in PFP, this packet
 	 * should precede it.
 	 */
-	if (flags & CP_DMA_PFP_SYNC_ME) {
+	if (sctx->has_graphics && flags & CP_DMA_PFP_SYNC_ME) {
 		radeon_emit(cs, PKT3(PKT3_PFP_SYNC_ME, 0, 0));
 		radeon_emit(cs, 0);
 	}