diff options
| author | Sidath Senanayake <sidaths@google.com> | 2017-05-18 14:43:17 +0200 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2017-05-18 14:43:17 +0200 |
| commit | 6f5ab3baed824941f168ab133469f997d4450146 (patch) | |
| tree | 95dcbadaa979f84a8d75c0919af1b85c5afd1924 /mali_kbase/backend/gpu/mali_kbase_jm_rb.c | |
| parent | 48f3554a4abf9ce182253fb5415a1a26b0790998 (diff) | |
| download | gpu-6f5ab3baed824941f168ab133469f997d4450146.tar.gz | |
Mali Bifrost DDK r6p0 KMD
Provenance:
b67d8663a (collaborate/EAC/b_r6p0)
BX304L01B-BU-00000-r6p0-01rel0
BX304L06A-BU-00000-r6p0-01rel0
BX304X07X-BU-00000-r6p0-01rel0
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I6b19113374d523be9a75a252d672731600e991d6
Diffstat (limited to 'mali_kbase/backend/gpu/mali_kbase_jm_rb.c')
| -rw-r--r-- | mali_kbase/backend/gpu/mali_kbase_jm_rb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mali_kbase/backend/gpu/mali_kbase_jm_rb.c b/mali_kbase/backend/gpu/mali_kbase_jm_rb.c index 418ae1f..1e9b9e5 100644 --- a/mali_kbase/backend/gpu/mali_kbase_jm_rb.c +++ b/mali_kbase/backend/gpu/mali_kbase_jm_rb.c @@ -672,10 +672,9 @@ static void kbase_gpu_release_atom(struct kbase_device *kbdev, (katom->protected_state.enter == KBASE_ATOM_ENTER_PROTECTED_IDLE_L2)) { kbase_vinstr_resume(kbdev->vinstr_ctx); -#ifdef CONFIG_DEVFREQ_THERMAL + /* Go back to configured model for IPA */ kbase_ipa_model_use_configured_locked(kbdev); -#endif } @@ -784,7 +783,8 @@ static int kbase_gpu_protected_mode_enter(struct kbase_device *kbdev) if (kbdev->protected_ops) { /* Switch GPU to protected mode */ - err = kbdev->protected_ops->protected_mode_enter(kbdev); + err = kbdev->protected_ops->protected_mode_enable( + kbdev->protected_dev); if (err) dev_warn(kbdev->dev, "Failed to enable protected mode: %d\n", @@ -806,6 +806,8 @@ static int kbase_gpu_protected_mode_reset(struct kbase_device *kbdev) if (!kbdev->protected_ops) return -EINVAL; + /* The protected mode disable callback will be called as part of reset + */ kbase_reset_gpu_silent(kbdev); return 0; @@ -841,10 +843,8 @@ static int kbase_jm_enter_protected_mode(struct kbase_device *kbdev, return -EAGAIN; } -#ifdef CONFIG_DEVFREQ_THERMAL /* Use generic model for IPA in protected mode */ kbase_ipa_model_use_fallback_locked(kbdev); -#endif /* Once reaching this point GPU must be * switched to protected mode or vinstr @@ -907,10 +907,9 @@ static int kbase_jm_enter_protected_mode(struct kbase_device *kbdev, kbase_gpu_dequeue_atom(kbdev, js, NULL); kbase_jm_return_atom_to_js(kbdev, katom[idx]); } -#ifdef CONFIG_DEVFREQ_THERMAL + /* Go back to configured model for IPA */ kbase_ipa_model_use_configured_locked(kbdev); -#endif return -EINVAL; } @@ -990,10 +989,9 @@ static int kbase_jm_exit_protected_mode(struct kbase_device *kbdev, } kbase_vinstr_resume(kbdev->vinstr_ctx); -#ifdef CONFIG_DEVFREQ_THERMAL + /* Use generic model for IPA in protected mode */ kbase_ipa_model_use_fallback_locked(kbdev); -#endif return -EINVAL; } @@ -1516,6 +1514,8 @@ void kbase_backend_reset(struct kbase_device *kbdev, ktime_t *end_timestamp) { KBASE_TLSTREAM_AUX_PROTECTED_LEAVE_END(kbdev); + kbase_vinstr_resume(kbdev->vinstr_ctx); + /* protected mode sanity checks */ KBASE_DEBUG_ASSERT_MSG( kbase_jd_katom_is_protected(katom) == kbase_gpu_in_protected_mode(kbdev), |