From: Jiyu Yang <jiyu.yang@amlogic.com>
Date: Wed, 26 Jun 2019 06:12:24 +0000 (+0800)
Subject: gpu: fix halt gpu rendering [2/2]
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7b1ecd60e0bfdc8a98b892baf1fb8e6919eb7bd8;p=GitHub%2FLineageOS%2FG12%2Fandroid_hardware_amlogic_kernel-modules_mali-driver.git

gpu: fix halt gpu rendering [2/2]

PD#SWPL-10285

Problem:
halt gpu rendering

Solution:
fixed possible gpu halt rendering

Verify:
franklin

Change-Id: Ifcd91dac6a8bf281d7c3d6639564eb34676f0a8a
Signed-off-by: Jiyu Yang <jiyu.yang@amlogic.com>
---

diff --git a/dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c b/dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c
index c714582..747de93 100755
--- a/dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c
+++ b/dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c
@@ -344,14 +344,18 @@ static void kbase_gpu_release_atom(struct kbase_device *kbdev,
 				(katom->protected_state.enter !=
 				KBASE_ATOM_ENTER_PROTECTED_CHECK) &&
 				(katom->protected_state.enter !=
-				KBASE_ATOM_ENTER_PROTECTED_HWCNT))
+				KBASE_ATOM_ENTER_PROTECTED_HWCNT)) {
 			kbase_pm_protected_override_disable(kbdev);
+			kbase_pm_update_cores_state_nolock(kbdev);
+		}
 		if (!kbase_jd_katom_is_protected(katom) &&
 				(katom->protected_state.exit !=
 				KBASE_ATOM_EXIT_PROTECTED_CHECK) &&
 				(katom->protected_state.exit !=
-				KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT))
+				KBASE_ATOM_EXIT_PROTECTED_RESET_WAIT)) {
 			kbase_pm_protected_override_disable(kbdev);
+			kbase_pm_update_cores_state_nolock(kbdev);
+		}
 
 		if (katom->protected_state.enter !=
 				KBASE_ATOM_ENTER_PROTECTED_CHECK ||