list_for_each_entry_safe(waiter, next, head, list) {
list_del(&waiter->list);
handler(waiter);
- atomic_set(&waiter->state, WLS_HANDLED);
- smp_wmb();
+ WARN_ON(atomic_xchg(&waiter->state, WLS_HANDLED) != WLS_REMOVED);
kref_put(&waiter->refcount, waiter_release);
}
}
for (id = 0, syncpt = intr->syncpt;
id < NV_HOST1X_SYNCPT_NB_PTS;
- ++id, ++syncpt)
+ ++id, ++syncpt) {
+ struct nvhost_waitlist *waiter, *next;
+ list_for_each_entry_safe(waiter, next, &syncpt->wait_head, list) {
+ if (atomic_cmpxchg(&waiter->state, WLS_CANCELLED, WLS_HANDLED)
+ == WLS_CANCELLED) {
+ list_del(&waiter->list);
+ kref_put(&waiter->refcount, waiter_release);
+ }
+ }
+
+ if(!list_empty(&syncpt->wait_head)) { // output diagnostics
+ printk("%s id=%d\n",__func__,id);
+ BUG_ON(1);
+ }
+
if (syncpt->irq_requested)
free_irq(syncpt->irq, syncpt);
+ }
if (intr->host1x_isr_started) {
free_irq(intr->host1x_irq, intr);