diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-27 14:20:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-27 14:20:43 +0100 |
| commit | 25703c69ad900a03162a5cc4ed24337f5f31dfe8 (patch) | |
| tree | 4757a03ab35f7e6fa7dad52c6bd6afc6da2f63be /include | |
| parent | 1c7ef95a59c296796e47977c7843c9c070473dff (diff) | |
| parent | 09b195a7bb23df56269cd2a95d01ba3a5533af13 (diff) | |
| download | linux-next-25703c69ad900a03162a5cc4ed24337f5f31dfe8.tar.gz linux-next-25703c69ad900a03162a5cc4ed24337f5f31dfe8.zip | |
Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_bridge.h | 2 | ||||
| -rw-r--r-- | include/uapi/drm/nouveau_drm.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 3ac84ed57ab2..58fff047f43b 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -40,9 +40,9 @@ struct drm_bridge; struct drm_bridge_timings; struct drm_connector; struct drm_display_info; +struct drm_edid; struct drm_minor; struct drm_panel; -struct edid; struct hdmi_codec_daifmt; struct hdmi_codec_params; struct i2c_adapter; diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h index 1fa82fa6af38..c4905b3e4e91 100644 --- a/include/uapi/drm/nouveau_drm.h +++ b/include/uapi/drm/nouveau_drm.h @@ -89,6 +89,7 @@ struct drm_nouveau_getparam { #define NOUVEAU_FIFO_ENGINE_PPP 0x04 #define NOUVEAU_FIFO_ENGINE_BSP 0x08 #define NOUVEAU_FIFO_ENGINE_CE 0x30 +#define NOUVEAU_FIFO_ENGINE_NVDEC 0x300 struct drm_nouveau_channel_alloc { __u32 fb_ctxdma_handle; |