Revert "nouveau/gsp/rm: cleanup IS_ERR_OR_NULL in core implementation"

This is probably too risky, see the discussion here:

  https://lists.freedesktop.org/archives/dri-devel/2026-May/570353.html

This reverts commit 67346c90ce275e835e93a4a13041afee47bd3f9e.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Timur Tabi <ttabi@nvidia.com>
Link: https://patch.msgid.link/20260528192847.4077458-3-lyude@redhat.com
Signed-off-by: Danilo Krummrich <dakr@kernel.org>

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c
index 27f275d2e151017cdb095676f5ad9f2005db2789..46e3a29f2ad7f0c6dc80cb4f1a1e21e22437aae2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c
@@ -35,7 +35,7 @@ r535_gsp_rpc_rm_free(struct nvkm_gsp_object *object)
                   client->object.handle, object->handle);
 
        rpc = nvkm_gsp_rpc_get(gsp, NV_VGPU_MSG_FUNCTION_FREE, sizeof(*rpc));
-       if (WARN_ON(IS_ERR(rpc)))
+       if (WARN_ON(IS_ERR_OR_NULL(rpc)))
                return -EIO;
 
        rpc->params.hRoot = client->object.handle;
@@ -60,7 +60,7 @@ r535_gsp_rpc_rm_alloc_push(struct nvkm_gsp_object *object, void *params)
        void *ret = NULL;
 
        rpc = nvkm_gsp_rpc_push(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV, sizeof(*rpc));
-       if (IS_ERR(rpc))
+       if (IS_ERR_OR_NULL(rpc))
                return rpc;
 
        if (rpc->status) {

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c
index 41301f19729cf86800847a1a63d72422328306e1..3ca3de8f434082d881675e49c6c08b2cdefdc60b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c
@@ -324,7 +324,7 @@ r535_gsp_msgq_recv(struct nvkm_gsp *gsp, u32 gsp_rpc_len, int *retries)
                u32 size;
 
                rpc = r535_gsp_msgq_peek(gsp, sizeof(*rpc), info.retries);
-               if (IS_ERR(rpc)) {
+               if (IS_ERR_OR_NULL(rpc)) {
                        kvfree(buf);
                        return rpc;
                }
@@ -333,7 +333,7 @@ r535_gsp_msgq_recv(struct nvkm_gsp *gsp, u32 gsp_rpc_len, int *retries)
                info.continuation = true;
 
                rpc = r535_gsp_msgq_recv_one_elem(gsp, &info);
-               if (IS_ERR(rpc)) {
+               if (IS_ERR_OR_NULL(rpc)) {
                        kvfree(buf);
                        return rpc;
                }