commit aafa7a84e3158042ca456b1f3329c2890c72d53f
author Tim Murray <timmurray@google.com> Thu May 09 13:22:53 2013 -0700
committer Tim Murray <timmurray@google.com> Thu May 09 13:25:47 2013 -0700
tree e5d83d08891388493e47719f96759cbe931a523e
parent 20f62caa884739810a0074383952797abb9b08a3

Fix IO_OUTPUT teardown issue.

bug 8891075

Change-Id: I6ec8d9a7db6def3db4111923d366f00f329cdacf

driver/rsdAllocation.cpp

diff --git a/driver/rsdAllocation.cpp b/driver/rsdAllocation.cpp
index ef7d024..2f9aa6d 100644
--- a/driver/rsdAllocation.cpp
+++ b/driver/rsdAllocation.cpp
@@ -476,8 +476,9 @@
 #endif
 
     if (alloc->mHal.drvState.lod[0].mallocPtr) {
-        // don't free user-allocated ptrs
-        if (!(drv->useUserProvidedPtr)) {
+        // don't free user-allocated ptrs or IO_OUTPUT buffers
+        if (!(drv->useUserProvidedPtr) &&
+            !(alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_IO_OUTPUT)) {
             free(alloc->mHal.drvState.lod[0].mallocPtr);
         }
         alloc->mHal.drvState.lod[0].mallocPtr = NULL;