From 4e6be49eee445fbc15f84caa9d0e85da55b3bc77 Mon Sep 17 00:00:00 2001
From: Johnny Liu <johnliu@nvidia.com>
Date: Fri, 28 Apr 2023 00:23:36 +0000
Subject: [PATCH] gpu: nvgpu: Correct the name of devfreq governor

Remove the duplicated nvhost_pod_scaling_governor_v2 and switch to the
nvhost_pod_scaling_governor.

Bug 4074863

Signed-off-by: Johnny Liu <johnliu@nvidia.com>
Change-Id: Ia6016cab46e97f04366d6cf14355b2e7e0989df8
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2895568
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 drivers/gpu/nvgpu/os/linux/module.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index 273a6cf35..b007f8a33 100644
--- a/drivers/gpu/nvgpu/os/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
@@ -2106,8 +2106,12 @@ static void __exit gk20a_exit(void)
 MODULE_IMPORT_NS(DMA_BUF);
 #endif
 #ifdef CONFIG_GK20A_DEVFREQ
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+MODULE_SOFTDEP("pre: governor_pod_scaling");
+#else
 MODULE_SOFTDEP("pre: governor_pod_scaling_v2");
 #endif
+#endif
 MODULE_LICENSE("GPL v2");
 module_init(gk20a_init);
 module_exit(gk20a_exit);