diff options
| author | Jason Sams <jsams@google.com> | 2015-05-18 17:45:26 -0700 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2015-05-18 17:45:26 -0700 |
| commit | e989da4557767e87f2199b81170c9af7c97df41b (patch) | |
| tree | 21325f24cce0d71fac014b1b2cecbfbea0b3ec61 /driver | |
| parent | 874ed8dee9ab7118efb517f6a8a9c1758818fd4c (diff) | |
| download | rs-e989da4557767e87f2199b81170c9af7c97df41b.tar.gz | |
Fix problems with allocation destruction
Cancel rather than try to queue the buffer queue to avoid
deadlocks on exit.
bug 20894664
Change-Id: Ie6375e67af66069472361ea4da9c111e19090684
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/rsdAllocation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/driver/rsdAllocation.cpp b/driver/rsdAllocation.cpp index 34670867..94efab24 100644 --- a/driver/rsdAllocation.cpp +++ b/driver/rsdAllocation.cpp @@ -553,7 +553,7 @@ void rsdAllocationDestroy(const Context *rsc, Allocation *alloc) { if (nw) { GraphicBufferMapper &mapper = GraphicBufferMapper::get(); mapper.unlock(drv->wndBuffer->handle); - int32_t r = nw->queueBuffer(nw, drv->wndBuffer, -1); + int32_t r = nw->cancelBuffer(nw, drv->wndBuffer, -1); drv->wndSurface = nullptr; native_window_api_disconnect(nw, NATIVE_WINDOW_API_CPU); |