commit 7695cae89e48a7697af4807ea060e855a75267e0
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 05 01:21:41 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 05 01:21:41 2020 +0000
tree 9733c0f8a1af79e4379a2f279fd58c0f0786800e
parent 6b01f9b29267f71420391f0505efb644c81cefc9
parent 2ae5f4a6bfb09b3bbc46f32c97a17e87cb973054

Merge "db845c: gralloc_gbm: Handle null crop values"

gralloc/gralloc_gbm.cpp

diff --git a/gralloc/gralloc_gbm.cpp b/gralloc/gralloc_gbm.cpp
index ab6c12b..43907e5 100644
--- a/gralloc/gralloc_gbm.cpp
+++ b/gralloc/gralloc_gbm.cpp
@@ -428,6 +428,15 @@
 
 	usage |= bo_data->locked_for;
 
+	/*
+	 * Some users will lock with an null crop rect.
+	 * Interpret this as no-crop (full buffer WxH).
+	 */
+	if (w == 0 && h == 0) {
+		w = gbm_handle->width;
+		h = gbm_handle->height;
+	}
+
 	if (usage & (GRALLOC_USAGE_SW_WRITE_MASK |
 		     GRALLOC_USAGE_SW_READ_MASK)) {
 		/* the driver is supposed to wait for the bo */