diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-07-13 11:33:00 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2022-07-13 11:33:00 +0300 |
| commit | 4de395f2c632c31c575f72d49d4f4389c99dab68 (patch) | |
| tree | 29abd2c05c697f2d6bde19c10064c49246253828 /drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h | |
| parent | bbd60fee2d2166b2b8722cbad740996ef2e7ce40 (diff) | |
| parent | 0180290abb5ce5c870f84a00ffeda5802f641dce (diff) | |
| download | linux-4de395f2c632c31c575f72d49d4f4389c99dab68.tar.xz | |
Merge drm/drm-next into drm-misc-next
I need to have some vc4 patches merged in -rc4, but drm-misc-next is
only at -rc2 for now.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h index 899272801a8b..79cec57647f0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h @@ -7,7 +7,6 @@ int nvkm_fifo_ctor(const struct nvkm_fifo_func *, struct nvkm_device *, enum nvkm_subdev_type, int, int nr, struct nvkm_fifo *); void nvkm_fifo_uevent(struct nvkm_fifo *); -void nvkm_fifo_cevent(struct nvkm_fifo *); void nvkm_fifo_kevent(struct nvkm_fifo *, int chid); void nvkm_fifo_recover_chan(struct nvkm_fifo *, int chid); |