Module: Mesa Branch: main Commit: 68f7e497fe74c4625fbe3c3fcc49e064b9b59e3f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=68f7e497fe74c4625fbe3c3fcc49e064b9b59e3f
Author: Marek Olšák <marek.ol...@amd.com> Date: Sun Dec 3 23:32:17 2023 -0500 winsys/amdgpu: fix amdgpu_cs_has_user_fence for VPE invert the condition to prevent this in the future. Reviewed-by: Yogesh Mohan Marimuthu <yogesh.mohanmarimu...@amd.com> Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-pra...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26547> --- src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 1e892d738b5..57778d15c79 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -534,12 +534,9 @@ amdgpu_ctx_query_reset_status(struct radeon_winsys_ctx *rwctx, bool full_reset_o static bool amdgpu_cs_has_user_fence(struct amdgpu_cs_context *cs) { - return cs->chunk_ib[IB_MAIN].ip_type != AMDGPU_HW_IP_UVD && - cs->chunk_ib[IB_MAIN].ip_type != AMDGPU_HW_IP_VCE && - cs->chunk_ib[IB_MAIN].ip_type != AMDGPU_HW_IP_UVD_ENC && - cs->chunk_ib[IB_MAIN].ip_type != AMDGPU_HW_IP_VCN_DEC && - cs->chunk_ib[IB_MAIN].ip_type != AMDGPU_HW_IP_VCN_ENC && - cs->chunk_ib[IB_MAIN].ip_type != AMDGPU_HW_IP_VCN_JPEG; + return cs->chunk_ib[IB_MAIN].ip_type == AMD_IP_GFX || + cs->chunk_ib[IB_MAIN].ip_type == AMD_IP_COMPUTE || + cs->chunk_ib[IB_MAIN].ip_type == AMD_IP_SDMA; } static inline unsigned amdgpu_cs_epilog_dws(struct amdgpu_cs *cs)
