From 1e8b8e0878fc6342d6530fdaa04239315f511c50 Mon Sep 17 00:00:00 2001
From: Jan Vesely <jan.vesely@rutgers.edu>
Date: Tue, 24 Jul 2018 22:17:28 -0400
Subject: [PATCH] clover: Reduce wait_count in abort path.

Trigger waiter condition variable.
Passes 'events' CTS on carrizo and turks.
v2: reduce to 0

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
---
 src/gallium/state_trackers/clover/core/event.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/clover/core/event.cpp b/src/gallium/state_trackers/clover/core/event.cpp
index b7eb33dbfc8..3d313ce8969 100644
--- a/src/gallium/state_trackers/clover/core/event.cpp
+++ b/src/gallium/state_trackers/clover/core/event.cpp
@@ -41,7 +41,7 @@ event::trigger_self() {
    std::lock_guard<std::mutex> lock(mutex);
    std::vector<intrusive_ref<event>> evs;
 
-   if (!--_wait_count)
+   if (_wait_count && !--_wait_count)
       std::swap(_chain, evs);
 
    cv.notify_all();
@@ -65,8 +65,10 @@ event::abort_self(cl_int status) {
    std::vector<intrusive_ref<event>> evs;
 
    _status = status;
+   _wait_count = 0;
    std::swap(_chain, evs);
 
+   cv.notify_all();
    return evs;
 }