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

Ben Skeggs · airlied · commit 6a0fd03a23fd · 2023-10-31T15:08:10.000+10:00
- disable BUS 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-8-skeggsb@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/gf100.c
@@ -24,6 +24,8 @@
  */
 #include "priv.h"
 
+#include <subdev/gsp.h>
+
 static void
 gf100_bus_intr(struct nvkm_bus *bus)
 {
@@ -72,5 +74,8 @@ int
 gf100_bus_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
 	      struct nvkm_bus **pbus)
 {
+	if (nvkm_gsp_rm(device->gsp))
+		return -ENODEV;
+
 	return nvkm_bus_new_(&gf100_bus, device, type, inst, pbus);
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`*/`
`25`	`25`	`#include "priv.h"`
`26`	`26`
	`27`	`+#include <subdev/gsp.h>`
	`28`	`+`
`27`	`29`	`static void`
`28`	`30`	`gf100_bus_intr(struct nvkm_bus *bus)`
`29`	`31`	`{`
`@@ -72,5 +74,8 @@ int`
`72`	`74`	`gf100_bus_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,`
`73`	`75`	`struct nvkm_bus **pbus)`
`74`	`76`	`{`
	`77`	`+ if (nvkm_gsp_rm(device->gsp))`
	`78`	`+ return -ENODEV;`
	`79`	`+`
`75`	`80`	`return nvkm_bus_new_(&gf100_bus, device, type, inst, pbus);`
`76`	`81`	`}`