diff options
| author | Jiyu Yang <Jiyu.Yang@amlogic.com> | 2018-03-13 11:33:03 +0800 |
|---|---|---|
| committer | Jiyu Yang <jiyu.yang@amlogic.com> | 2018-03-16 02:45:04 -0800 |
| commit | 0a75bc5a837c4bdfac0feeb18b2b1decb35f8cf5 (patch) | |
| tree | f05de20f7e6e20b6fd98c34825f9f6fcfbe537d6 | |
| parent | d947be5bb4ab1348b153154d5aadd9ea87739811 (diff) | |
| download | mali-driver-0a75bc5a837c4bdfac0feeb18b2b1decb35f8cf5.tar.gz | |
gpu: mali internal fence wait signaled when return -ENOENT
PD#160990
Note that the callback can be called from an atomic context. If
fence is already signaled, this function will return -ENOENT (and
*not* call the callback)
Change-Id: I347e082b7b7639f8122f65734467977494a53445
| -rw-r--r-- | mali/linux/mali_internal_sync.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/mali/linux/mali_internal_sync.c b/mali/linux/mali_internal_sync.c index d8939dc..a951cef 100644 --- a/mali/linux/mali_internal_sync.c +++ b/mali/linux/mali_internal_sync.c @@ -95,7 +95,8 @@ static void mali_internal_fence_check_cb_func(struct dma_fence *fence, struct dm ret =sync_fence->fence->ops->signaled(sync_fence->fence); if (0 > ret) - MALI_PRINT_ERROR(("Mali internal sync:Failed to wait fence 0x%x for sync_fence 0x%x.\n", fence, sync_fence)); + trace_printk("Mali internal sync:fence signaled? ret=%d, fence 0x%p for sync_fence 0x%p.\n", ret, fence, sync_fence); + if (1 == ret) wake_up_all(&sync_fence->wq); #endif @@ -549,8 +550,10 @@ int mali_internal_sync_fence_wait_async(struct mali_internal_sync_fence *sync_fe else err = -1; - if (0 > err) + if (0 > err) { + trace_printk("Mali, line%d, signal error\n", __LINE__); return err; + } if (1 == err) return err; @@ -561,8 +564,12 @@ int mali_internal_sync_fence_wait_async(struct mali_internal_sync_fence *sync_fe err = fence_add_callback(sync_fence->fence, &waiter->cb, mali_internal_fence_check_cb_func); #endif - if (0 != err) + if (0 != err) { + trace_printk("Mali, fence_add_callback error %d\n", err); + if (-ENOENT == err) + err = 1; return err; + } init_waitqueue_func_entry(&waiter->work, mali_internal_sync_fence_wake_up_wq); waiter->work.private = sync_fence; @@ -572,7 +579,10 @@ int mali_internal_sync_fence_wait_async(struct mali_internal_sync_fence *sync_fe if (0 == err) __add_wait_queue_tail(&sync_fence->wq, &waiter->work); + spin_unlock_irqrestore(&sync_fence->wq.lock, flags); + if ((1 != err) && (0 != err)) + trace_printk("Mali, line%d, signal error\n", __LINE__); return err; #endif |