diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index a6f56763e..f3a333f37 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1599,9 +1599,13 @@ static int _gk20a_init_domain(struct device_node *np,
 #endif
 
 	of_genpd_add_provider_simple(np, gpd);
+
+#warning genpd_pm_subdomain_attach does not work with upstream
+#if 0
 	gpd->of_node = of_node_get(np);
 
 	genpd_pm_subdomain_attach(gpd);
+#endif
 	return 0;
 }