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

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

diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl826e.h b/drivers/gpu/drm/nouveau/include/nvif/cl826e.h
index 05e6ef7cd19002f4ecc2e973cece3bdc102ea564..91e33db21a2fe47178781469929675cc91cda191 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/cl826e.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/cl826e.h
@@ -10,5 +10,5 @@ struct g82_channel_dma_v0 {
        __u64 offset;
 };
 
-#define G82_CHANNEL_DMA_V0_NTFY_UEVENT                                     0x00
+#define NV826E_V0_NTFY_NON_STALL_INTERRUPT                                 0x00
 #endif

diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl826f.h b/drivers/gpu/drm/nouveau/include/nvif/cl826f.h
index cecafcb1e9549d9eb2ff804753c9293f499cfbdf..e34efd4ec5371e2c42a4c89fc3052757a96724ab 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/cl826f.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/cl826f.h
@@ -11,5 +11,5 @@ struct g82_channel_gpfifo_v0 {
        __u64 vm;
 };
 
-#define G82_CHANNEL_GPFIFO_V0_NTFY_UEVENT                                  0x00
+#define NV826F_V0_NTFY_NON_STALL_INTERRUPT                                 0x00
 #endif

diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl906f.h b/drivers/gpu/drm/nouveau/include/nvif/cl906f.h
index 2caf0838fcfdc9680f708ded893dd155e4981b00..e9302ec5cbfa609b134476dc94c786a844c7488f 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/cl906f.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/cl906f.h
@@ -10,5 +10,5 @@ struct fermi_channel_gpfifo_v0 {
        __u64 vm;
 };
 
-#define FERMI_CHANNEL_GPFIFO_V0_NTFY_UEVENT                                0x00
+#define NV906F_V0_NTFY_NON_STALL_INTERRUPT                                 0x00
 #endif

diff --git a/drivers/gpu/drm/nouveau/include/nvif/cla06f.h b/drivers/gpu/drm/nouveau/include/nvif/cla06f.h
index 46301ec018ce5670c0f2d7d2a3254bdedb3d59e6..567123a8f87437ad765db7872753ef5db4f88ba9 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/cla06f.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/cla06f.h
@@ -25,5 +25,5 @@ struct kepler_channel_gpfifo_a_v0 {
        __u64 vm;
 };
 
-#define NVA06F_V0_NTFY_UEVENT                                              0x00
+#define NVA06F_V0_NTFY_NON_STALL_INTERRUPT                                 0x00
 #endif

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index a6126c93f215b0118e2c152cd0ad18d87c6f62ea..f3e551f1aa46c59aee9328c7e8a1bc9bcdcda5a3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -190,7 +190,7 @@ nouveau_fence_context_new(struct nouveau_channel *chan, struct nouveau_fence_cha
                return;
 
        ret = nvif_notify_init(&chan->user, nouveau_fence_wait_uevent_handler,
-                              false, G82_CHANNEL_DMA_V0_NTFY_UEVENT,
+                              false, NV826E_V0_NTFY_NON_STALL_INTERRUPT,
                               &(struct nvif_notify_uevent_req) { },
                               sizeof(struct nvif_notify_uevent_req),
                               sizeof(struct nvif_notify_uevent_rep),

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c
index 15a992b3580a17b35c06567392a11523c629825d..66bd1cda56028370112e5719741f4b7ea0af4430 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c
@@ -35,7 +35,7 @@ g84_fifo_chan_ntfy(struct nvkm_fifo_chan *chan, u32 type,
                   struct nvkm_event **pevent)
 {
        switch (type) {
-       case G82_CHANNEL_DMA_V0_NTFY_UEVENT:
+       case NV826E_V0_NTFY_NON_STALL_INTERRUPT:
                *pevent = &chan->fifo->uevent;
                return 0;
        default: