drm/amdgpu/vpe: don't emit cond exec command under collaborate mode

Lang Yu · alexdeucher · commit d40f6213b52c · 2024-03-07T15:33:04.000-05:00
Not ready now.

Signed-off-by: Lang Yu &lt;Lang.Yu@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
@@ -571,6 +571,9 @@ static unsigned int vpe_ring_init_cond_exec(struct amdgpu_ring *ring,
 {
 	unsigned int ret;
 
+	if (ring->adev->vpe.collaborate_mode)
+		return ~0;
+
 	amdgpu_ring_write(ring, VPE_CMD_HEADER(VPE_CMD_OPCODE_COND_EXE, 0));
 	amdgpu_ring_write(ring, lower_32_bits(addr));
 	amdgpu_ring_write(ring, upper_32_bits(addr));

Original file line number	Diff line number	Diff line change
`@@ -571,6 +571,9 @@ static unsigned int vpe_ring_init_cond_exec(struct amdgpu_ring *ring,`
`571`	`571`	`{`
`572`	`572`	`unsigned int ret;`
`573`	`573`
	`574`	`+ if (ring->adev->vpe.collaborate_mode)`
	`575`	`+ return ~0;`
	`576`	`+`
`574`	`577`	`amdgpu_ring_write(ring, VPE_CMD_HEADER(VPE_CMD_OPCODE_COND_EXE, 0));`
`575`	`578`	`amdgpu_ring_write(ring, lower_32_bits(addr));`
`576`	`579`	`amdgpu_ring_write(ring, upper_32_bits(addr));`