am 2d91d000: Merge "Revert "gralloc: Add asynchronous lock/unlock API""

* commit '2d91d000bce3db23ac51888d109c9f29272ea96a':
  Revert "gralloc: Add asynchronous lock/unlock API"

1 files changed, 1 insertions, 50 deletions

diff --git a/include/hardware/gralloc.h b/include/hardware/gralloc.h
index e7d0103a..0dbebcff 100644
--- a/include/hardware/gralloc.h
+++ b/include/hardware/gralloc.h
@@ -44,14 +44,10 @@ __BEGIN_DECLS
  *
  * GRALLOC_MODULE_API_VERSION_0_2:
  * Add support for flexible YCbCr format with (*lock_ycbcr)() method.
- *
- * GRALLOC_MODULE_API_VERSION_0_3:
- * Add support for fence passing to/from lock/unlock.
  */
 
 #define GRALLOC_MODULE_API_VERSION_0_1  HARDWARE_MODULE_API_VERSION(0, 1)
 #define GRALLOC_MODULE_API_VERSION_0_2  HARDWARE_MODULE_API_VERSION(0, 2)
-#define GRALLOC_MODULE_API_VERSION_0_3  HARDWARE_MODULE_API_VERSION(0, 3)
 
 #define GRALLOC_DEVICE_API_VERSION_0_1  HARDWARE_DEVICE_API_VERSION(0, 1)
 
@@ -245,53 +241,8 @@ typedef struct gralloc_module_t {
             int l, int t, int w, int h,
             struct android_ycbcr *ycbcr);
 
-    /*
-     * The (*lockAsync)() method is like the (*lock)() method except
-     * that the buffer's sync fence object is passed into the lock
-     * call instead of requiring the caller to wait for completion.
-     *
-     * The gralloc implementation takes ownership of the fenceFd and
-     * is responsible for closing it when no longer needed.
-     *
-     * Added in GRALLOC_MODULE_API_VERSION_0_3.
-     */
-    int (*lockAsync)(struct gralloc_module_t const* module,
-            buffer_handle_t handle, int usage,
-            int l, int t, int w, int h,
-            void** vaddr, int fenceFd);
-
-    /*
-     * The (*unlockAsync)() method is like the (*unlock)() method
-     * except that a buffer sync fence object is returned from the
-     * lock call, representing the completion of any pending work
-     * performed by the gralloc implementation.
-     *
-     * The caller takes ownership of the fenceFd and is responsible
-     * for closing it when no longer needed.
-     *
-     * Added in GRALLOC_MODULE_API_VERSION_0_3.
-     */
-    int (*unlockAsync)(struct gralloc_module_t const* module,
-            buffer_handle_t handle, int* fenceFd);
-
-    /*
-     * The (*lockAsync_ycbcr)() method is like the (*lock_ycbcr)()
-     * method except that the buffer's sync fence object is passed
-     * into the lock call instead of requiring the caller to wait for
-     * completion.
-     *
-     * The gralloc implementation takes ownership of the fenceFd and
-     * is responsible for closing it when no longer needed.
-     *
-     * Added in GRALLOC_MODULE_API_VERSION_0_3.
-     */
-    int (*lockAsync_ycbcr)(struct gralloc_module_t const* module,
-            buffer_handle_t handle, int usage,
-            int l, int t, int w, int h,
-            struct android_ycbcr *ycbcr, int fenceFd);
-
     /* reserved for future use */
-    void* reserved_proc[3];
+    void* reserved_proc[6];
 } gralloc_module_t;
 
 /*****************************************************************************/