gpu: fix halt gpu rendering [2/2]
authorJiyu Yang <jiyu.yang@amlogic.com>
Wed, 26 Jun 2019 06:12:24 +0000 (14:12 +0800)
committerJiyu Yang <jiyu.yang@amlogic.com>
Wed, 3 Jul 2019 06:00:07 +0000 (23:00 -0700)
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>
dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c

index c714582dfd79a6a4f4fa30ad94e0d77aa095a9b5..747de9372a4583ae26b209c3707b242fc6bcd857 100755 (executable)
@@ -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 ||