Skip to content

Commit 24ab185

Browse files
committed
nouveau/gsp: add three notifier callbacks that we see in normal operation (v2)
Add NULL callbacks for some things GSP calls that we don't handle, but know about so we avoid the logging. v2: Timur suggested allowing null fn. Signed-off-by: Dave Airlie <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent ed9895d commit 24ab185

File tree

1 file changed

+5
-2
lines changed
  • drivers/gpu/drm/nouveau/nvkm/subdev/gsp

1 file changed

+5
-2
lines changed

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,8 @@ r535_gsp_msg_recv(struct nvkm_gsp *gsp, int fn, u32 repc)
298298
struct nvkm_gsp_msgq_ntfy *ntfy = &gsp->msgq.ntfy[i];
299299

300300
if (ntfy->fn == msg->function) {
301-
ntfy->func(ntfy->priv, ntfy->fn, msg->data, msg->length - sizeof(*msg));
301+
if (ntfy->func)
302+
ntfy->func(ntfy->priv, ntfy->fn, msg->data, msg->length - sizeof(*msg));
302303
break;
303304
}
304305
}
@@ -2186,7 +2187,9 @@ r535_gsp_oneinit(struct nvkm_gsp *gsp)
21862187
r535_gsp_msg_ntfy_add(gsp, NV_VGPU_MSG_EVENT_MMU_FAULT_QUEUED,
21872188
r535_gsp_msg_mmu_fault_queued, gsp);
21882189
r535_gsp_msg_ntfy_add(gsp, NV_VGPU_MSG_EVENT_OS_ERROR_LOG, r535_gsp_msg_os_error_log, gsp);
2189-
2190+
r535_gsp_msg_ntfy_add(gsp, NV_VGPU_MSG_EVENT_PERF_BRIDGELESS_INFO_UPDATE, NULL, NULL);
2191+
r535_gsp_msg_ntfy_add(gsp, NV_VGPU_MSG_EVENT_UCODE_LIBOS_PRINT, NULL, NULL);
2192+
r535_gsp_msg_ntfy_add(gsp, NV_VGPU_MSG_EVENT_GSP_SEND_USER_SHARED_DATA, NULL, NULL);
21902193
ret = r535_gsp_rm_boot_ctor(gsp);
21912194
if (ret)
21922195
return ret;

0 commit comments

Comments
 (0)