Commit 6c9705f6 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo: expose channel killed in host channel event class 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 8c880fd4

drivers/gpu/drm/nouveau/include/nvif/cl906f.h

+0 −2
Original line number Diff line number Diff line
@@ -10,6 +10,4 @@ struct fermi_channel_gpfifo_v0 { 
	__u64 ioffset;

	__u64 vmm;

};



#define NV906F_V0_NTFY_KILLED                                              0x01

#endif

drivers/gpu/drm/nouveau/include/nvif/cla06f.h

+0 −2
Original line number Diff line number Diff line
@@ -12,6 +12,4 @@ struct kepler_channel_gpfifo_a_v0 { 
	__u64 vmm;

	__u64 inst;

};



#define NVA06F_V0_NTFY_KILLED                                              0x01

#endif

drivers/gpu/drm/nouveau/include/nvif/clc36f.h

+0 −2
Original line number Diff line number Diff line
@@ -13,6 +13,4 @@ struct volta_channel_gpfifo_a_v0 { 
	__u64 inst;

	__u32 token;

};



#define NVC36F_V0_NTFY_KILLED                                              0x01

#endif

drivers/gpu/drm/nouveau/include/nvif/if0020.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ union nvif_chan_event_args { 
	struct nvif_chan_event_v0 {

		__u8 version;

#define NVIF_CHAN_EVENT_V0_NON_STALL_INTR 0x00

#define NVIF_CHAN_EVENT_V0_KILLED         0x01

		__u8 type;

	} v0;

};

drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct nvkm_fifo { 


#define NVKM_FIFO_EVENT_NON_STALL_INTR BIT(0)

	struct nvkm_event uevent; /* async user trigger */

#define NVKM_FIFO_EVENT_KILLED         BIT(0)

	struct nvkm_event kevent; /* channel killed */

};