Merge "gralloc_gbm: fix gralloc_gbm_bo_lock() declaration" am: a7f5619ed2 am: 3594d8f08f

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1345436

Change-Id: Ie2970514e18d884fd09493e027f49700dcbcb95f
diff --git a/gralloc/gralloc_gbm_priv.h b/gralloc/gralloc_gbm_priv.h
index 7174fb8..d0326c5 100644
--- a/gralloc/gralloc_gbm_priv.h
+++ b/gralloc/gralloc_gbm_priv.h
@@ -43,7 +43,7 @@
 buffer_handle_t gralloc_gbm_bo_get_handle(struct gbm_bo *bo);
 int gralloc_gbm_get_gem_handle(buffer_handle_t handle);
 
-int gralloc_gbm_bo_lock(buffer_handle_t handle, int x, int y, int w, int h, int enable_write, void **addr);
+int gralloc_gbm_bo_lock(buffer_handle_t handle, int usage, int x, int y, int w, int h, void **addr);
 int gralloc_gbm_bo_unlock(buffer_handle_t handle);
 
 struct gbm_device *gbm_dev_create(void);