diff options
| author | Sidath Senanayake <sidaths@google.com> | 2020-10-27 11:38:49 +0000 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2020-10-27 11:38:49 +0000 |
| commit | 72f2457ff7355ff0389efe5bc9cec3365362d8c4 (patch) | |
| tree | 8f5fb993bd2a8eb181c880b180b6401b46f76620 /mali_kbase/backend/gpu/mali_kbase_jm_rb.c | |
| parent | d4ca6eb7268ee2db9deabd1745b505c6e1c162f9 (diff) | |
| download | gpu-72f2457ff7355ff0389efe5bc9cec3365362d8c4.tar.gz | |
Mali Valhall DDK r27p0 KMD
Provenance:
7e6f74ec1 (collaborate/EAC/v_r27p0)
VX504X08X-BU-00000-r27p0-01eac0 - Android DDK
VX504X08X-SW-99006-r27p0-01eac0 - Android Renderscript AOSP parts
VX504X08X-BU-60000-r27p0-01eac0 - Android Document Bundle
VX504X08X-DC-11001-r27p0-01eac0 - Valhall Android DDK Software Errata
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ib59de731b034cc7e2631e35f1b0063b8f6894ecc
Diffstat (limited to 'mali_kbase/backend/gpu/mali_kbase_jm_rb.c')
| -rw-r--r-- | mali_kbase/backend/gpu/mali_kbase_jm_rb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mali_kbase/backend/gpu/mali_kbase_jm_rb.c b/mali_kbase/backend/gpu/mali_kbase_jm_rb.c index 8b409a0..afaaef2 100644 --- a/mali_kbase/backend/gpu/mali_kbase_jm_rb.c +++ b/mali_kbase/backend/gpu/mali_kbase_jm_rb.c @@ -35,7 +35,7 @@ #include <mali_kbase_reset_gpu.h> #include <mali_kbase_kinstr_jm.h> #include <backend/gpu/mali_kbase_cache_policy_backend.h> -#include <backend/gpu/mali_kbase_device_internal.h> +#include <device/mali_kbase_device.h> #include <backend/gpu/mali_kbase_jm_internal.h> #include <backend/gpu/mali_kbase_pm_internal.h> @@ -254,6 +254,8 @@ static bool kbase_gpu_check_secure_atoms(struct kbase_device *kbdev, int kbase_backend_slot_free(struct kbase_device *kbdev, int js) { + lockdep_assert_held(&kbdev->hwaccess_lock); + if (atomic_read(&kbdev->hwaccess.backend.reset_gpu) != KBASE_RESET_GPU_NOT_PENDING) { /* The GPU is being reset - so prevent submission */ @@ -620,7 +622,7 @@ static int kbase_jm_enter_protected_mode(struct kbase_device *kbdev, KBASE_PM_CORE_L2) || kbase_pm_get_trans_cores(kbdev, KBASE_PM_CORE_L2) || - kbase_is_gpu_lost(kbdev)) { + kbase_is_gpu_removed(kbdev)) { /* * The L2 is still powered, wait for all * the users to finish with it before doing @@ -813,7 +815,8 @@ void kbase_backend_slot_update(struct kbase_device *kbdev) lockdep_assert_held(&kbdev->hwaccess_lock); #ifdef CONFIG_MALI_ARBITER_SUPPORT - if (kbase_reset_gpu_is_active(kbdev) || kbase_is_gpu_lost(kbdev)) + if (kbase_reset_gpu_is_active(kbdev) || + kbase_is_gpu_removed(kbdev)) #else if (kbase_reset_gpu_is_active(kbdev)) #endif |