ODROID-C5: gpu/arm: Mali update from 'yocto-kirkstone-bsp-202409'
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I9812dd66cb202157770963dc3173c7d3cab80e2b
diff --git a/drivers/gpu/arm/midgard/csf/mali_kbase_csf_scheduler.c b/drivers/gpu/arm/midgard/csf/mali_kbase_csf_scheduler.c
index eb60d65..4d7fa24 100644
--- a/drivers/gpu/arm/midgard/csf/mali_kbase_csf_scheduler.c
+++ b/drivers/gpu/arm/midgard/csf/mali_kbase_csf_scheduler.c
@@ -4666,7 +4666,7 @@
*/
if (suspend && (unlikely(atomic_read(&scheduler->gpu_no_longer_idle)) ||
unlikely(!all_on_slot_groups_remained_idle(kbdev)))) {
- dev_info(kbdev->dev,
+ dev_dbg(kbdev->dev,
"GPU suspension skipped due to active CSGs");
suspend = false;
}
diff --git a/drivers/gpu/arm/midgard/csf/mali_kbase_csf_tiler_heap_reclaim.c b/drivers/gpu/arm/midgard/csf/mali_kbase_csf_tiler_heap_reclaim.c
index 069e827..92641d8 100644
--- a/drivers/gpu/arm/midgard/csf/mali_kbase_csf_tiler_heap_reclaim.c
+++ b/drivers/gpu/arm/midgard/csf/mali_kbase_csf_tiler_heap_reclaim.c
@@ -293,7 +293,7 @@
sc->nr_scanned = freed;
#endif /* (KERNEL_VERSION(4, 14, 0) <= LINUX_VERSION_CODE) */
- dev_info(kbdev->dev, "Tiler heap reclaim scan freed pages: %lu (unused: %lu)", freed,
+ dev_dbg(kbdev->dev, "Tiler heap reclaim scan freed pages: %lu (unused: %lu)", freed,
avail);
/* On estimate suggesting available, yet actual free failed, return STOP */
diff --git a/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c b/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
index c27c05b..15f55b2 100644
--- a/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
+++ b/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
@@ -412,11 +412,12 @@
gcdev->get_gpu_freq = get_mali_freq;
#endif
err = gpufreq_cooling_register(gcdev);
-#ifdef CONFIG_DEVFREQ_THERMAL
- meson_gcooldev_min_update(gcdev->cool_dev);
-#endif
if (err < 0)
printk("register GPU cooling error\n");
+#ifdef CONFIG_DEVFREQ_THERMAL
+ else
+ meson_gcooldev_min_update(gcdev->cool_dev);
+#endif
}
gccdev = gpucore_cooling_alloc();
@@ -428,11 +429,12 @@
gccdev->max_gpu_core_num = mali_plat_data.cfg_pp;
gccdev->set_max_pp_num = set_limit_pp_num;
err = (int)gpucore_cooling_register(gccdev);
-#ifdef CONFIG_DEVFREQ_THERMAL
- meson_gcooldev_min_update(gccdev->cool_dev);
-#endif
if (err < 0)
printk("register GPU cooling error\n");
+#ifdef CONFIG_DEVFREQ_THERMAL
+ else
+ meson_gcooldev_min_update(gccdev->cool_dev);
+#endif
}
#endif
}