From: Dave Airlie <[email protected]>

In turing systems where gsp exists, but can end up not being used,
we need to add a second check.

Fixes: cb4c7603678c ("drm/nouveau/gsp/r570: Add support for 
INTERNAL_GCX_ENTRY_PREREQUISITE")
Reported-by: Woody Suwalski <[email protected]>
Tested-by: Woody Suwalski <[email protected]>
Cc: Lyude Paul <[email protected]>
---
 drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c 
b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
index f78e6b9b4292..b841d66f8bb3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
@@ -201,7 +201,7 @@ nvkm_udevice_gcx_ready(struct nvkm_udevice *udev, void 
*data, u32 size)
        } *args = data;
        int ret = -ENOSYS;
 
-       if (!gsp) {
+       if (!gsp || !gsp->rm) {
                args->v0.ready = NV_DEVICE_GC6_READY | NV_DEVICE_GCOFF_READY;
                return 0;
        }
-- 
2.55.0

Reply via email to