Commit e95bb6b6 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/gsp: add hal for gsp.drop_send_user_shared_data() 



545.23.06 removes NV_VGPU_MSG_EVENT_GSP_SEND_USER_SHARED_DATA, but has
another event (NVLINK_FAULT_UP) in its place.

Signed-off-by: default avatarBen Skeggs <bskeggs@nvidia.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarTimur Tabi <ttabi@nvidia.com>
Tested-by: default avatarTimur Tabi <ttabi@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 20235009

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

+10 −1
Original line number Diff line number Diff line
@@ -2092,6 +2092,12 @@ r535_gsp_dtor(struct nvkm_gsp *gsp) 
	nvkm_gsp_mem_dtor(&gsp->logrm);

}



static void

r535_gsp_drop_send_user_shared_data(struct nvkm_gsp *gsp)

{

	r535_gsp_msg_ntfy_add(gsp, NV_VGPU_MSG_EVENT_GSP_SEND_USER_SHARED_DATA, NULL, NULL);

}



int

r535_gsp_oneinit(struct nvkm_gsp *gsp)

{
@@ -2139,7 +2145,9 @@ r535_gsp_oneinit(struct nvkm_gsp *gsp) 
	r535_gsp_msg_ntfy_add(gsp, NV_VGPU_MSG_EVENT_OS_ERROR_LOG, r535_gsp_msg_os_error_log, gsp);

	r535_gsp_msg_ntfy_add(gsp, NV_VGPU_MSG_EVENT_PERF_BRIDGELESS_INFO_UPDATE, NULL, NULL);

	r535_gsp_msg_ntfy_add(gsp, NV_VGPU_MSG_EVENT_UCODE_LIBOS_PRINT, NULL, NULL);

	r535_gsp_msg_ntfy_add(gsp, NV_VGPU_MSG_EVENT_GSP_SEND_USER_SHARED_DATA, NULL, NULL);

	if (rmapi->gsp->drop_send_user_shared_data)

		rmapi->gsp->drop_send_user_shared_data(gsp);



	ret = r535_gsp_rm_boot_ctor(gsp);

	if (ret)

		return ret;
@@ -2169,4 +2177,5 @@ r535_gsp = { 
	.set_system_info = r535_gsp_set_system_info,

	.get_static_info = r535_gsp_get_static_info,

	.xlat_mc_engine_idx = r535_gsp_xlat_mc_engine_idx,

	.drop_send_user_shared_data = r535_gsp_drop_send_user_shared_data,

};

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct nvkm_rm_api { 
		int (*set_system_info)(struct nvkm_gsp *);

		int (*get_static_info)(struct nvkm_gsp *);

		bool (*xlat_mc_engine_idx)(u32 mc_engine_idx, enum nvkm_subdev_type *, int *inst);

		void (*drop_send_user_shared_data)(struct nvkm_gsp *);

	} *gsp;



	const struct nvkm_rm_api_rpc {