diff --git a/drivers/gpu/nvgpu/hal/pmu/pmu_ga10b.c b/drivers/gpu/nvgpu/hal/pmu/pmu_ga10b.c
index 0cf738bd2..418de2a20 100644
--- a/drivers/gpu/nvgpu/hal/pmu/pmu_ga10b.c
+++ b/drivers/gpu/nvgpu/hal/pmu/pmu_ga10b.c
@@ -38,7 +38,18 @@ bool ga10b_is_pmu_supported(struct gk20a *g)
 {
 	(void)g;
 #ifdef CONFIG_NVGPU_LS_PMU
-	return nvgpu_platform_is_simulation(g) ? false : true;
+	if (nvgpu_platform_is_silicon(g)) {
+		return true;
+	} else {
+		/* Pre-Si platforms */
+		if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {
+			/* Security is enabled - PMU is supported. */
+			return true;
+		} else {
+			/* NS PMU is not supported */
+			return false;
+		}
+	}
 #else
 	/* set to false to disable LS PMU ucode support */
 	return false;