Mali Valhall DDK r32p1 BETA 3 KMD

Provenance:
 ecd72da85 (collaborate/google/android/v_r32p1-00bet0)
 VX504X08X-BU-00000-r32p1-00bet3 - Valhall Android DDK
 VX504X08X-BU-60000-r32p1-00bet3 - Valhall Android Document Bundle
 VX504X08X-DC-11001-r32p1-00bet3 - Valhall Android DDK Software Errata
 VX504X08X-SW-99006-r32p1-00bet3 - Valhall Android Renderscript AOSP parts

Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I1d753f0fb97e4bafe7c65453f07d787bef0d8e25

4 files changed, 54 insertions, 7 deletions

diff --git a/mali_kbase/Kbuild b/mali_kbase/Kbuild
index b198157..c520597 100644
--- a/mali_kbase/Kbuild
+++ b/mali_kbase/Kbuild
@@ -67,7 +67,7 @@ endif
 #
 
 # Driver version string which is returned to userspace via an ioctl
-MALI_RELEASE_NAME ?= '"r32p1-00bet2"'
+MALI_RELEASE_NAME ?= '"r32p1-01eac0"'
 # Set up defaults if not defined by build system
 ifeq ($(CONFIG_MALI_DEBUG), y)
     MALI_UNIT_TEST = 1
diff --git a/mali_kbase/arbitration/Kconfig b/mali_kbase/arbitration/Kconfig
index 6f2f0dc..95125f9 100644
--- a/mali_kbase/arbitration/Kconfig
+++ b/mali_kbase/arbitration/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 #
-# (C) COPYRIGHT 2021 ARM Limited. All rights reserved.
+# (C) COPYRIGHT 2012-2021 ARM Limited. All rights reserved.
 #
 # This program is free software and is provided to you under the terms of the
 # GNU General Public License version 2 as published by the Free Software
@@ -17,3 +17,23 @@
 # http://www.gnu.org/licenses/gpl-2.0.html.
 #
 #
+
+config MALI_XEN
+	bool "Enable Xen Interface reference code"
+	depends on MALI_ARBITRATION && XEN
+	default n
+	help
+	  Enables the build of xen interface modules used in the reference
+	  virtualization setup for Mali
+	  If unsure, say N.
+
+config MALI_KUTF_ARBITRATION_TEST
+	bool "Enable Arbitration Test reference code"
+	depends on MALI_KUTF && MALI_ARBITRATION
+	default n
+	help
+	  Enables the build of test modules used in the reference
+	  virtualization setup for Mali
+	  If unsure, say N.
+
+source "drivers/gpu/arm/midgard/arbitration/ptm/Kconfig"
diff --git a/mali_kbase/arbitration/ptm/Kconfig b/mali_kbase/arbitration/ptm/Kconfig
new file mode 100644
index 0000000..e11e674
--- /dev/null
+++ b/mali_kbase/arbitration/ptm/Kconfig
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note OR MIT
+#
+# (C) COPYRIGHT 2021 ARM Limited. All rights reserved.
+#
+# This program is free software and is provided to you under the terms of the
+# GNU General Public License version 2 as published by the Free Software
+# Foundation, and any use by you of this program is subject to the terms
+# of such GNU license.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, you can access it online at
+# http://www.gnu.org/licenses/gpl-2.0.html.
+#
+#
+
+config MALI_PARTITION_MANAGER
+	bool "Enable compilation of partition manager modules"
+	depends on MALI_ARBITRATION
+	default n
+	help
+	  This option enables the compilation of the partition manager
+	  modules used to configure the Mali-G78AE GPU.
+
diff --git a/mali_kbase/backend/gpu/mali_kbase_jm_rb.c b/mali_kbase/backend/gpu/mali_kbase_jm_rb.c
index a3cb547..b475d79 100644
--- a/mali_kbase/backend/gpu/mali_kbase_jm_rb.c
+++ b/mali_kbase/backend/gpu/mali_kbase_jm_rb.c
@@ -1452,11 +1452,10 @@ bool kbase_backend_soft_hard_stop_slot(struct kbase_device *kbdev,
 		else
 			katom_idx1_valid = false;
 	} else {
-		katom_idx0_valid = (katom_idx0 &&
-				(!kctx || katom_idx0->kctx == kctx));
-		katom_idx1_valid = (katom_idx1 &&
-				(!kctx || katom_idx1->kctx == kctx) &&
-				prio_idx0 == prio_idx1);
+		katom_idx0_valid =
+			(katom_idx0 && (!kctx || katom_idx0->kctx == kctx));
+		katom_idx1_valid =
+			(katom_idx1 && (!kctx || katom_idx1->kctx == kctx));
 	}
 
 	if (katom_idx0_valid)