diff options
| author | Usama Arif <usama.arif@arm.com> | 2020-09-22 15:16:17 +0100 |
|---|---|---|
| committer | Tushar Khandelwal <tushar.khandelwal@arm.com> | 2021-04-22 20:27:11 +0100 |
| commit | 81bdf140847a8ee81faf9acd3cb2748100f2e36f (patch) | |
| tree | e3bf8d29ecff16910506d3dd4087fe64aaf6c3fc | |
| parent | 10b5182f6c7e8c85bb9de683a88171d925b6eb53 (diff) | |
tc0: remove minigbm patch merged in android 11
Change-Id: I8c08fcd63b9649e8dbe32f56d320c5c04befd1ed
Signed-off-by: Usama Arif <usama.arif@arm.com>
| -rw-r--r-- | tc0/patches/0001-Make-drv_mapping_destroy-be-called-in-release-builds.patch | 51 | ||||
| -rw-r--r-- | tc0/vendorsetup.sh | 1 |
2 files changed, 0 insertions, 52 deletions
diff --git a/tc0/patches/0001-Make-drv_mapping_destroy-be-called-in-release-builds.patch b/tc0/patches/0001-Make-drv_mapping_destroy-be-called-in-release-builds.patch deleted file mode 100644 index 8497164..0000000 --- a/tc0/patches/0001-Make-drv_mapping_destroy-be-called-in-release-builds.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0907d821ccd589ecc0e047909cc6df18ddb5f31c Mon Sep 17 00:00:00 2001 -From: Jason Macnak <natsu@google.com> -Date: Tue, 12 Nov 2019 10:53:05 -0800 -Subject: [PATCH] Make drv_mapping_destroy() be called in release builds -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The entire assert statement is currently being dropped when NDEBUG is defined -which causes mappings to never be cleaned up on bo destruction. When mappings -are not cleaned up, a new buffer that gets a recycled handle may find an old -mapping in drv_bo_map() which is not valid for the new buffer. - -BUG=b:123764798 -TEST=built and ran with cuttlefish locally - -Change-Id: Ib7147c3f5ed3a2b84793dfc2b17236ee0d92ac13 -Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/1912760 -Tested-by: Jason Macnak <natsu@google.com> -Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> -Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org> -Commit-Queue: Jason Macnak <natsu@google.com> ---- - drv.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drv.c b/drv.c -index ef5cbc5..872b5d4 100644 ---- a/drv.c -+++ b/drv.c -@@ -320,6 +320,7 @@ struct bo *drv_bo_create_with_modifiers(struct driver *drv, uint32_t width, uint - - void drv_bo_destroy(struct bo *bo) - { -+ int ret; - size_t plane; - uintptr_t total = 0; - struct driver *drv = bo->drv; -@@ -335,7 +336,8 @@ void drv_bo_destroy(struct bo *bo) - pthread_mutex_unlock(&drv->driver_lock); - - if (total == 0) { -- assert(drv_mapping_destroy(bo) == 0); -+ ret = drv_mapping_destroy(bo); -+ assert(ret == 0); - bo->drv->backend->bo_destroy(bo); - } - --- -2.17.1 - diff --git a/tc0/vendorsetup.sh b/tc0/vendorsetup.sh index 768548e..4fd6aeb 100644 --- a/tc0/vendorsetup.sh +++ b/tc0/vendorsetup.sh @@ -35,6 +35,5 @@ PATCHES_DIR=$ANDROID_TOP_DIR/device/arm/tc0/patches apply_patch "system/core" "0001-Add-amba-bus-support-to-platform-devices.patch" apply_patch "external/minigbm" "0001-minigbm-komeda-Add-driver.patch" -apply_patch "external/minigbm" "0001-Make-drv_mapping_destroy-be-called-in-release-builds.patch" apply_patch "external/swiftshader" "0001-Don-t-unlock-Android-buffers-immediately-after-locki.patch" apply_patch "frameworks/base" "0001-core-Build-ro.system-when-comparing-fingerprint.patch" |