drm/nouveau/therm/tu102-: prepare for GSP-RM

Ben Skeggs · airlied · commit f2b76a18251d · 2023-10-31T15:08:13.000+10:00
- disable THERM completely when GSP-RM detected Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-21-skeggsb@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c
@@ -23,6 +23,8 @@
  */
 #include "priv.h"
 
+#include <subdev/gsp.h>
+
 static int
 gp100_temp_get(struct nvkm_therm *therm)
 {
@@ -52,5 +54,8 @@ int
 gp100_therm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
 		struct nvkm_therm **ptherm)
 {
+	if (nvkm_gsp_rm(device->gsp))
+		return -ENODEV;
+
 	return nvkm_therm_new_(&gp100_therm, device, type, inst, ptherm);
 }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`*/`
`24`	`24`	`#include "priv.h"`
`25`	`25`
	`26`	`+#include <subdev/gsp.h>`
	`27`	`+`
`26`	`28`	`static int`
`27`	`29`	`gp100_temp_get(struct nvkm_therm *therm)`
`28`	`30`	`{`
`@@ -52,5 +54,8 @@ int`
`52`	`54`	`gp100_therm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,`
`53`	`55`	`struct nvkm_therm **ptherm)`
`54`	`56`	`{`
	`57`	`+ if (nvkm_gsp_rm(device->gsp))`
	`58`	`+ return -ENODEV;`
	`59`	`+`
`55`	`60`	`return nvkm_therm_new_(&gp100_therm, device, type, inst, ptherm);`
`56`	`61`	`}`