diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/cl906f.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/cla06f.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/clc36f.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/if0020.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 1 |
5 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl906f.h b/drivers/gpu/drm/nouveau/include/nvif/cl906f.h index 0e17b21e8c6e..5ccc8fd8c458 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl906f.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl906f.h @@ -10,6 +10,4 @@ struct fermi_channel_gpfifo_v0 { __u64 ioffset; __u64 vmm; }; - -#define NV906F_V0_NTFY_KILLED 0x01 #endif diff --git a/drivers/gpu/drm/nouveau/include/nvif/cla06f.h b/drivers/gpu/drm/nouveau/include/nvif/cla06f.h index 00057ddfa41f..10449accd3e8 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cla06f.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cla06f.h @@ -12,6 +12,4 @@ struct kepler_channel_gpfifo_a_v0 { __u64 vmm; __u64 inst; }; - -#define NVA06F_V0_NTFY_KILLED 0x01 #endif diff --git a/drivers/gpu/drm/nouveau/include/nvif/clc36f.h b/drivers/gpu/drm/nouveau/include/nvif/clc36f.h index b36624760dea..cdf6708e1d9a 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/clc36f.h +++ b/drivers/gpu/drm/nouveau/include/nvif/clc36f.h @@ -13,6 +13,4 @@ struct volta_channel_gpfifo_a_v0 { __u64 inst; __u32 token; }; - -#define NVC36F_V0_NTFY_KILLED 0x01 #endif diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0020.h b/drivers/gpu/drm/nouveau/include/nvif/if0020.h index 29a9fe2a8d87..1893b8aa0abb 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/if0020.h +++ b/drivers/gpu/drm/nouveau/include/nvif/if0020.h @@ -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; }; diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h index ebfca3ffe9ae..5a19c71f7ccb 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h @@ -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 */ }; |