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

Ben Skeggs · airlied · commit a25a5d560dad · 2023-10-31T15:08:11.000+10:00
- disable I2C 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-14-skeggsb@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm200.c
@@ -24,6 +24,8 @@
 #include "priv.h"
 #include "pad.h"
 
+#include <subdev/gsp.h>
+
 static void
 gm200_aux_autodpcd(struct nvkm_i2c *i2c, int aux, bool enable)
 {
@@ -44,5 +46,8 @@ int
 gm200_i2c_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
 	      struct nvkm_i2c **pi2c)
 {
+	if (nvkm_gsp_rm(device->gsp))
+		return -ENODEV;
+
 	return nvkm_i2c_new_(&gm200_i2c, device, type, inst, pi2c);
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`#include "priv.h"`
`25`	`25`	`#include "pad.h"`
`26`	`26`
	`27`	`+#include <subdev/gsp.h>`
	`28`	`+`
`27`	`29`	`static void`
`28`	`30`	`gm200_aux_autodpcd(struct nvkm_i2c *i2c, int aux, bool enable)`
`29`	`31`	`{`
`@@ -44,5 +46,8 @@ int`
`44`	`46`	`gm200_i2c_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,`
`45`	`47`	`struct nvkm_i2c **pi2c)`
`46`	`48`	`{`
	`49`	`+ if (nvkm_gsp_rm(device->gsp))`
	`50`	`+ return -ENODEV;`
	`51`	`+`
`47`	`52`	`return nvkm_i2c_new_(&gm200_i2c, device, type, inst, pi2c);`
`48`	`53`	`}`