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

Ben Skeggs · airlied · commit 8c186c83f995 · 2023-10-31T15:08:14.000+10:00
- (temporarily) disable if GSP-RM detected, will be added later - pass "suspend" flag down to chipset-specific DISP code 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-25-skeggsb@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
@@ -105,7 +105,7 @@ nvkm_disp_fini(struct nvkm_engine *engine, bool suspend)
 	struct nvkm_outp *outp;
 
 	if (disp->func->fini)
-		disp->func->fini(disp);
+		disp->func->fini(disp, suspend);
 
 	list_for_each_entry(outp, &disp->outps, head) {
 		if (outp->func->fini)
@@ -208,6 +208,9 @@ nvkm_disp_dtor(struct nvkm_engine *engine)
 		nvkm_head_del(&head);
 	}
 
+	if (disp->func->dtor)
+		disp->func->dtor(disp);
+
 	return data;
 }
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c
@@ -24,6 +24,7 @@
 #include "head.h"
 #include "ior.h"
 
+#include <subdev/gsp.h>
 #include <subdev/timer.h>
 
 #include <nvif/class.h>
@@ -147,5 +148,8 @@ int
 ga102_disp_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
 	       struct nvkm_disp **pdisp)
 {
+	if (nvkm_gsp_rm(device->gsp))
+		return -ENODEV;
+
 	return nvkm_disp_new_(&ga102_disp, device, type, inst, pdisp);
 }
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
@@ -1154,7 +1154,7 @@ gf119_disp_intr(struct nvkm_disp *disp)
 }
 
 void
-gf119_disp_fini(struct nvkm_disp *disp)
+gf119_disp_fini(struct nvkm_disp *disp, bool suspend)
 {
 	struct nvkm_device *device = disp->engine.subdev.device;
 	/* disable all interrupts */
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
@@ -1115,7 +1115,7 @@ gv100_disp_intr(struct nvkm_disp *disp)
 }
 
 void
-gv100_disp_fini(struct nvkm_disp *disp)
+gv100_disp_fini(struct nvkm_disp *disp, bool suspend)
 {
 	struct nvkm_device *device = disp->engine.subdev.device;
 	nvkm_wr32(device, 0x611db0, 0x00000000);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
@@ -1504,7 +1504,7 @@ nv50_disp_intr(struct nvkm_disp *disp)
 }
 
 void
-nv50_disp_fini(struct nvkm_disp *disp)
+nv50_disp_fini(struct nvkm_disp *disp, bool suspend)
 {
 	struct nvkm_device *device = disp->engine.subdev.device;
 	/* disable all interrupts */
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h
@@ -15,9 +15,10 @@ int nvkm_disp_new_(const struct nvkm_disp_func *, struct nvkm_device *, enum nvk
 void nvkm_disp_vblank(struct nvkm_disp *, int head);
 
 struct nvkm_disp_func {
+	void (*dtor)(struct nvkm_disp *);
 	int (*oneinit)(struct nvkm_disp *);
 	int (*init)(struct nvkm_disp *);
-	void (*fini)(struct nvkm_disp *);
+	void (*fini)(struct nvkm_disp *, bool suspend);
 	void (*intr)(struct nvkm_disp *);
 	void (*intr_error)(struct nvkm_disp *, int chid);
 
@@ -32,7 +33,7 @@ struct nvkm_disp_func {
 
 	u16 ramht_size;
 
-	const struct nvkm_sclass root;
+	struct nvkm_sclass root;
 
 	struct nvkm_disp_user {
 		struct nvkm_sclass base;
@@ -44,7 +45,7 @@ struct nvkm_disp_func {
 
 int nv50_disp_oneinit(struct nvkm_disp *);
 int nv50_disp_init(struct nvkm_disp *);
-void nv50_disp_fini(struct nvkm_disp *);
+void nv50_disp_fini(struct nvkm_disp *, bool suspend);
 void nv50_disp_intr(struct nvkm_disp *);
 extern const struct nvkm_enum nv50_disp_intr_error_type[];
 void nv50_disp_super(struct work_struct *);
@@ -56,12 +57,12 @@ void nv50_disp_super_2_2(struct nvkm_disp *, struct nvkm_head *);
 void nv50_disp_super_3_0(struct nvkm_disp *, struct nvkm_head *);
 
 int gf119_disp_init(struct nvkm_disp *);
-void gf119_disp_fini(struct nvkm_disp *);
+void gf119_disp_fini(struct nvkm_disp *, bool suspend);
 void gf119_disp_intr(struct nvkm_disp *);
 void gf119_disp_super(struct work_struct *);
 void gf119_disp_intr_error(struct nvkm_disp *, int);
 
-void gv100_disp_fini(struct nvkm_disp *);
+void gv100_disp_fini(struct nvkm_disp *, bool suspend);
 void gv100_disp_intr(struct nvkm_disp *);
 void gv100_disp_super(struct work_struct *);
 int gv100_disp_wndw_cnt(struct nvkm_disp *, unsigned long *);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c
@@ -25,6 +25,7 @@
 #include "ior.h"
 
 #include <core/gpuobj.h>
+#include <subdev/gsp.h>
 #include <subdev/timer.h>
 
 #include <nvif/class.h>
@@ -233,5 +234,8 @@ int
 tu102_disp_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
 	       struct nvkm_disp **pdisp)
 {
+	if (nvkm_gsp_rm(device->gsp))
+		return -ENODEV;
+
 	return nvkm_disp_new_(&tu102_disp, device, type, inst, pdisp);
 }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ nvkm_disp_fini(struct nvkm_engine *engine, bool suspend)`
`105`	`105`	`struct nvkm_outp *outp;`
`106`	`106`
`107`	`107`	`if (disp->func->fini)`
`108`		`- disp->func->fini(disp);`
	`108`	`+ disp->func->fini(disp, suspend);`
`109`	`109`
`110`	`110`	`list_for_each_entry(outp, &disp->outps, head) {`
`111`	`111`	`if (outp->func->fini)`
`@@ -208,6 +208,9 @@ nvkm_disp_dtor(struct nvkm_engine *engine)`
`208`	`208`	`nvkm_head_del(&head);`
`209`	`209`	`}`
`210`	`210`
	`211`	`+ if (disp->func->dtor)`
	`212`	`+ disp->func->dtor(disp);`
	`213`	`+`
`211`	`214`	`return data;`
`212`	`215`	`}`
`213`	`216`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`#include "head.h"`
`25`	`25`	`#include "ior.h"`
`26`	`26`
	`27`	`+#include <subdev/gsp.h>`
`27`	`28`	`#include <subdev/timer.h>`
`28`	`29`
`29`	`30`	`#include <nvif/class.h>`
`@@ -147,5 +148,8 @@ int`
`147`	`148`	`ga102_disp_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,`
`148`	`149`	`struct nvkm_disp **pdisp)`
`149`	`150`	`{`
	`151`	`+ if (nvkm_gsp_rm(device->gsp))`
	`152`	`+ return -ENODEV;`
	`153`	`+`
`150`	`154`	`return nvkm_disp_new_(&ga102_disp, device, type, inst, pdisp);`
`151`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1154,7 +1154,7 @@ gf119_disp_intr(struct nvkm_disp *disp)`
`1154`	`1154`	`}`
`1155`	`1155`
`1156`	`1156`	`void`
`1157`		`-gf119_disp_fini(struct nvkm_disp *disp)`
	`1157`	`+gf119_disp_fini(struct nvkm_disp *disp, bool suspend)`
`1158`	`1158`	`{`
`1159`	`1159`	`struct nvkm_device *device = disp->engine.subdev.device;`
`1160`	`1160`	`/* disable all interrupts */`
Original file line number	Diff line number	Diff line change
`@@ -1115,7 +1115,7 @@ gv100_disp_intr(struct nvkm_disp *disp)`
`1115`	`1115`	`}`
`1116`	`1116`
`1117`	`1117`	`void`
`1118`		`-gv100_disp_fini(struct nvkm_disp *disp)`
	`1118`	`+gv100_disp_fini(struct nvkm_disp *disp, bool suspend)`
`1119`	`1119`	`{`
`1120`	`1120`	`struct nvkm_device *device = disp->engine.subdev.device;`
`1121`	`1121`	`nvkm_wr32(device, 0x611db0, 0x00000000);`
Original file line number	Diff line number	Diff line change
`@@ -1504,7 +1504,7 @@ nv50_disp_intr(struct nvkm_disp *disp)`
`1504`	`1504`	`}`
`1505`	`1505`
`1506`	`1506`	`void`
`1507`		`-nv50_disp_fini(struct nvkm_disp *disp)`
	`1507`	`+nv50_disp_fini(struct nvkm_disp *disp, bool suspend)`
`1508`	`1508`	`{`
`1509`	`1509`	`struct nvkm_device *device = disp->engine.subdev.device;`
`1510`	`1510`	`/* disable all interrupts */`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`#include "ior.h"`
`26`	`26`
`27`	`27`	`#include <core/gpuobj.h>`
	`28`	`+#include <subdev/gsp.h>`
`28`	`29`	`#include <subdev/timer.h>`
`29`	`30`
`30`	`31`	`#include <nvif/class.h>`
`@@ -233,5 +234,8 @@ int`
`233`	`234`	`tu102_disp_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,`
`234`	`235`	`struct nvkm_disp **pdisp)`
`235`	`236`	`{`
	`237`	`+ if (nvkm_gsp_rm(device->gsp))`
	`238`	`+ return -ENODEV;`
	`239`	`+`
`236`	`240`	`return nvkm_disp_new_(&tu102_disp, device, type, inst, pdisp);`
`237`	`241`	`}`