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

[Alex Deucher]

Acked-by: Alex Deucher <alexander.deucher at amd.com>

On Mon, Mar 18, 2024 at 6:38 AM Lang Yu <Lang.Yu at amd.com> wrote:
>
> Ready now. Remove this workaround.
> This reverts commit 1a2bb3bb2a84f8364f0a8b338afa9b9025e1bcc0.
>
> Signed-off-by: Lang Yu <Lang.Yu at amd.com>
> Tested-by: Alan Liu <haoping.liu at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
> index 70c5cc80ecdc..7a65a2b128ec 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
> @@ -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));
> --
> 2.25.1
>