diff options
| author | Leo Liu <leo.liu@amd.com> | 2019-05-08 08:13:52 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-05-10 10:30:02 -0700 |
| commit | 1ad8a0e75190c01499153cea6e4a8c449a42b811 (patch) | |
| tree | 2fe595885c84a06ce528c617672e8a24eb737ec1 | |
| parent | f4ab855312ced8e5467615d09f9787aadce0b4f1 (diff) | |
winsys/amdgpu: add VCN JPEG to no user fence group
There is no user fence for JPEG, the bug triggering
kernel WARN_ON(flags & AMDGPU_FENCE_FLAG_64BIT)
Signed-off-by: Leo Liu <leo.liu@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit ceba9ff2948d7efa57d7035c7717f046303e7c64)
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 397e41c05f0..2e595e5a1b0 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -386,7 +386,8 @@ static bool amdgpu_cs_has_user_fence(struct amdgpu_cs_context *cs) cs->ib[IB_MAIN].ip_type != AMDGPU_HW_IP_VCE && cs->ib[IB_MAIN].ip_type != AMDGPU_HW_IP_UVD_ENC && cs->ib[IB_MAIN].ip_type != AMDGPU_HW_IP_VCN_DEC && - cs->ib[IB_MAIN].ip_type != AMDGPU_HW_IP_VCN_ENC; + cs->ib[IB_MAIN].ip_type != AMDGPU_HW_IP_VCN_ENC && + cs->ib[IB_MAIN].ip_type != AMDGPU_HW_IP_VCN_JPEG; } static bool amdgpu_cs_has_chaining(struct amdgpu_cs *cs) |