diff --git a/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
index 499c298f5..e6fe03999 100644
--- a/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
@@ -290,9 +290,9 @@ struct gk20a_platform ga10b_tegra_platform = {
 	.prescale = gp10b_tegra_prescale,
 	.postscale = gp10b_tegra_postscale,
 	/* Enable ga10b frequency scaling - JIRA NVGPU-4683 */
+	/* Disable frequency scaling */
 	.devfreq_governor = NULL,
-
-	.qos_notify = gk20a_scale_qos_notify,
+	.qos_notify = NULL,
 
 	.dump_platform_dependencies = gk20a_tegra_debug_dump,
 
diff --git a/drivers/gpu/nvgpu/os/linux/scale.c b/drivers/gpu/nvgpu/os/linux/scale.c
index 54a3a23da..bb812d2e4 100644
--- a/drivers/gpu/nvgpu/os/linux/scale.c
+++ b/drivers/gpu/nvgpu/os/linux/scale.c
@@ -1,7 +1,7 @@
 /*
  * gk20a clock scaling profile
  *
- * Copyright (c) 2013-2020, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2013-2021, NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -473,6 +473,9 @@ void gk20a_scale_exit(struct device *dev)
 	struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
 	int err;
 
+	if (!platform->devfreq_governor && !platform->qos_notify)
+		return;
+
 #ifdef CONFIG_GK20A_PM_QOS
 	if (platform->qos_notify) {
 		pm_qos_remove_min_notifier(PM_QOS_GPU_FREQ_BOUNDS,