tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/nouveau/fifo/g84-: rename non-stall interrupt event

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

Ben Skeggs 40cea739 e774055a

+6 -6
+1 -1
drivers/gpu/drm/nouveau/include/nvif/cl826e.h
··· 10 10 __u64 offset; 11 11 }; 12 12 13 - #define G82_CHANNEL_DMA_V0_NTFY_UEVENT 0x00 13 + #define NV826E_V0_NTFY_NON_STALL_INTERRUPT 0x00 14 14 #endif
+1 -1
drivers/gpu/drm/nouveau/include/nvif/cl826f.h
··· 11 11 __u64 vm; 12 12 }; 13 13 14 - #define G82_CHANNEL_GPFIFO_V0_NTFY_UEVENT 0x00 14 + #define NV826F_V0_NTFY_NON_STALL_INTERRUPT 0x00 15 15 #endif
+1 -1
drivers/gpu/drm/nouveau/include/nvif/cl906f.h
··· 10 10 __u64 vm; 11 11 }; 12 12 13 - #define FERMI_CHANNEL_GPFIFO_V0_NTFY_UEVENT 0x00 13 + #define NV906F_V0_NTFY_NON_STALL_INTERRUPT 0x00 14 14 #endif
+1 -1
drivers/gpu/drm/nouveau/include/nvif/cla06f.h
··· 25 25 __u64 vm; 26 26 }; 27 27 28 - #define NVA06F_V0_NTFY_UEVENT 0x00 28 + #define NVA06F_V0_NTFY_NON_STALL_INTERRUPT 0x00 29 29 #endif
+1 -1
drivers/gpu/drm/nouveau/nouveau_fence.c
··· 190 190 return; 191 191 192 192 ret = nvif_notify_init(&chan->user, nouveau_fence_wait_uevent_handler, 193 - false, G82_CHANNEL_DMA_V0_NTFY_UEVENT, 193 + false, NV826E_V0_NTFY_NON_STALL_INTERRUPT, 194 194 &(struct nvif_notify_uevent_req) { }, 195 195 sizeof(struct nvif_notify_uevent_req), 196 196 sizeof(struct nvif_notify_uevent_rep),
+1 -1
drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c
··· 35 35 struct nvkm_event **pevent) 36 36 { 37 37 switch (type) { 38 - case G82_CHANNEL_DMA_V0_NTFY_UEVENT: 38 + case NV826E_V0_NTFY_NON_STALL_INTERRUPT: 39 39 *pevent = &chan->fifo->uevent; 40 40 return 0; 41 41 default: