Commit 1b7eec6b authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

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



Ready now. Remove this workaround.
This reverts commit d40f6213.

Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Tested-by: default avatarAlan Liu <haoping.liu@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 03c6284d

drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c

+0 −3
Original line number Diff line number Diff line
@@ -575,9 +575,6 @@ 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));