From 36fb256e9ad0409749c694429eba002fe4099f8d Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Sat, 24 Feb 2024 19:46:26 +0100 Subject: [PATCH] rusticl/event: we need to call the CL_COMPLETE callback on errors as well Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10673 Fixes: 47a80d7ff4f ("rusticl/event: proper eventing support") Signed-off-by: Karol Herbst Part-of: --- src/gallium/frontends/rusticl/core/event.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/frontends/rusticl/core/event.rs b/src/gallium/frontends/rusticl/core/event.rs index 83711c16800..cc14ec6dd08 100644 --- a/src/gallium/frontends/rusticl/core/event.rs +++ b/src/gallium/frontends/rusticl/core/event.rs @@ -107,8 +107,11 @@ impl Event { self.cv.notify_all(); } - if [CL_COMPLETE, CL_RUNNING, CL_SUBMITTED].contains(&(new as u32)) { - if let Some(cbs) = lock.cbs.get_mut(new as usize) { + // on error we need to call the CL_COMPLETE callbacks + let cb_idx = if new < 0 { CL_COMPLETE } else { new as u32 }; + + if [CL_COMPLETE, CL_RUNNING, CL_SUBMITTED].contains(&cb_idx) { + if let Some(cbs) = lock.cbs.get_mut(cb_idx as usize) { cbs.drain(..).for_each(|cb| cb.call(self, new)); } }