From eaf544c6d90912cbbcdeee4a014ae347b4e63082 Mon Sep 17 00:00:00 2001 From: Zhen Chen Date: Mon, 24 Apr 2023 10:48:30 +0800 Subject: [PATCH] Mali: bifrost: disable tiler heap reclaiming temporally Comes from mail "230423: 15:04: ARM support: Yao: ". This patch and fw_230426 can resolve the occurrence of "Unhandled Page fault" and CS_FAULTs exceptions in the stress test "Dvfs+Gl_retrace+Rockx+emmc". In another mail, Yao said "before any further suggestion or conclusion from RD, you could temporally WA the issue by disable tiler heap reclaim". Signed-off-by: Zhen Chen Change-Id: If06aa8e207b05f1a277aae9a86d1ff76b9a9f93b --- .../bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c index 069e827d16ff..6357e3518d87 100644 --- a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c @@ -344,14 +344,6 @@ void kbase_csf_tiler_heap_reclaim_mgr_init(struct kbase_device *kbdev) reclaim->scan_objects = kbase_csf_tiler_heap_reclaim_scan_objects; reclaim->seeks = HEAP_SHRINKER_SEEKS; reclaim->batch = HEAP_SHRINKER_BATCH; - -#if !defined(CONFIG_MALI_VECTOR_DUMP) -#if KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE - register_shrinker(reclaim); -#else - register_shrinker(reclaim, "mali-csf-tiler-heap"); -#endif -#endif } void kbase_csf_tiler_heap_reclaim_mgr_term(struct kbase_device *kbdev) @@ -359,10 +351,6 @@ void kbase_csf_tiler_heap_reclaim_mgr_term(struct kbase_device *kbdev) struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; u8 prio; -#if !defined(CONFIG_MALI_VECTOR_DUMP) - unregister_shrinker(&scheduler->reclaim_mgr.heap_reclaim); -#endif - for (prio = KBASE_QUEUE_GROUP_PRIORITY_REALTIME; prio < KBASE_QUEUE_GROUP_PRIORITY_COUNT; prio++) WARN_ON(!list_empty(&scheduler->reclaim_mgr.ctx_lists[prio]));