From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 8 May 2018 10:39:46 +0000 (+1000)
Subject: drm/nouveau/gr/gf100-: support clkgate_pack everywhere
X-Git-Tag: microblaze-v4.18-rc3~70^2~7^2~123
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=cd9662f89e2cd953ce9b2fcf02fdaae847592bd1;p=linux-2.6-microblaze.git

drm/nouveau/gr/gf100-: support clkgate_pack everywhere

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index d127c6a7363c..eaf32f79ee47 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -32,6 +32,7 @@
 #include <subdev/fb.h>
 #include <subdev/mc.h>
 #include <subdev/pmu.h>
+#include <subdev/therm.h>
 #include <subdev/timer.h>
 #include <engine/fifo.h>
 
@@ -1949,6 +1950,9 @@ gf100_gr_init(struct gf100_gr *gr)
 	if (gr->func->init_r405a14)
 		gr->func->init_r405a14(gr);
 
+	if (gr->func->clkgate_pack)
+		nvkm_therm_clkgate_init(device->therm, gr->func->clkgate_pack);
+
 	nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001);
 
 	memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));