summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorLang Yu <Lang.Yu@amd.com>2024-01-31 10:40:42 +0300
committerAlex Deucher <alexander.deucher@amd.com>2024-03-07 23:33:04 +0300
commitd40f6213b52c161fd4634933acbc32103a283363 (patch)
tree698c11d27959f45781bd8d88947b399dd439f27d /drivers/gpu/drm
parent26f5f34e6e44f995d97b8917484373c22715fd8d (diff)
downloadlinux-d40f6213b52c161fd4634933acbc32103a283363.tar.xz
drm/amdgpu/vpe: don't emit cond exec command under collaborate mode
Not ready now. Signed-off-by: Lang Yu <Lang.Yu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
index 9d2415f26b7c..eea2487d2ea2 100644
--- 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));