commit 99ca7746265db8d38cc2722cb61b09dea6fe543c
author PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> Wed Nov 24 14:15:46 2021 +0800
committer Roger Liao <rogerliao@google.com> Wed Nov 24 14:30:17 2021 +0800
tree 5181455c2f6e3eace2aa2e947296338e0b6184a7
parent d32483c0d552172567387ccf18385e6c040e0474
parent b84f8e52e2b4a415b52adfffc818e81d0ef243b7

Merge android12-gs-pixel-5.10-sc-qpr2 into android12-gs-pixel-5.10-sc-v2

Bug: 199698959
SBMerger: 410055097
Change-Id: I8602182a64dd93218c58073e1f89201cd8f9f3e5
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>

mali_kbase/platform/pixel/pixel_gpu_dvfs.c

diff --git a/mali_kbase/platform/pixel/pixel_gpu_dvfs.c b/mali_kbase/platform/pixel/pixel_gpu_dvfs.c
index 89a3be7..ae6f496 100644
--- a/mali_kbase/platform/pixel/pixel_gpu_dvfs.c
+++ b/mali_kbase/platform/pixel/pixel_gpu_dvfs.c
@@ -625,7 +625,9 @@
 	}
 
 	/* Get the ASV table */
+	mutex_lock(&pc->dvfs.lock);
 	pc->dvfs.table_size = gpu_dvfs_update_asv_table(kbdev);
+	mutex_unlock(&pc->dvfs.lock);
 	if (pc->dvfs.table_size < 0) {
 		ret = -EINVAL;
 		goto done;