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

Ben Skeggs · airlied · commit f5a533a81e51 · 2023-10-31T15:08:12.000+10:00
- (temporarily) disable if GSP-RM detected, will be added later 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-18-skeggsb@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu102.c
@@ -24,6 +24,7 @@
 #include "vmm.h"
 
 #include <core/option.h>
+#include <subdev/gsp.h>
 
 #include <nvif/class.h>
 
@@ -54,5 +55,8 @@ int
 tu102_mmu_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
 	      struct nvkm_mmu **pmmu)
 {
+	if (nvkm_gsp_rm(device->gsp))
+		return -ENODEV;
+
 	return nvkm_mmu_new_(&tu102_mmu, device, type, inst, pmmu);
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`#include "vmm.h"`
`25`	`25`
`26`	`26`	`#include <core/option.h>`
	`27`	`+#include <subdev/gsp.h>`
`27`	`28`
`28`	`29`	`#include <nvif/class.h>`
`29`	`30`
`@@ -54,5 +55,8 @@ int`
`54`	`55`	`tu102_mmu_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,`
`55`	`56`	`struct nvkm_mmu **pmmu)`
`56`	`57`	`{`
	`58`	`+ if (nvkm_gsp_rm(device->gsp))`
	`59`	`+ return -ENODEV;`
	`60`	`+`
`57`	`61`	`return nvkm_mmu_new_(&tu102_mmu, device, type, inst, pmmu);`
`58`	`62`	`}`