From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 18 Sep 2023 20:21:24 +0000 (+1000)
Subject: drm/nouveau/privring/tu102-: prepare for GSP-RM
X-Git-Tag: v6.7-rc1~62^2~30
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fd7d598270724cc787982ea48bbe17ad383a8b7f;p=users%2Fdwmw2%2Flinux.git

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

- disable PRIVRING 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-20-skeggsb@gmail.com
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/privring/gm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/privring/gm200.c
index b4eaf6db36d72..b4530073bfdc4 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/privring/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/privring/gm200.c
@@ -23,6 +23,8 @@
  */
 #include "priv.h"
 
+#include <subdev/gsp.h>
+
 static const struct nvkm_subdev_func
 gm200_privring = {
 	.intr = gk104_privring_intr,
@@ -32,5 +34,8 @@ int
 gm200_privring_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
 		   struct nvkm_subdev **pprivring)
 {
+	if (nvkm_gsp_rm(device->gsp))
+		return -ENODEV;
+
 	return nvkm_subdev_new_(&gm200_privring, device, type, inst, pprivring);
 }