diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-05-10 12:06:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-05-10 12:06:28 +1000 |
| commit | 110ed472d3fcc8e12d3229c1fa501f06e3820b00 (patch) | |
| tree | d672faa15d30313d98b8ca602e89d38f4323ac86 /drivers/gpu/drm/meson | |
| parent | c815e4e79bc3e0175a944c59ebd14fbb6d986c27 (diff) | |
| parent | be3f3042391d061cfca2bd22630e0d101acea5fc (diff) | |
| download | lwn-110ed472d3fcc8e12d3229c1fa501f06e3820b00.tar.gz lwn-110ed472d3fcc8e12d3229c1fa501f06e3820b00.zip | |
Merge tag 'drm-misc-next-fixes-2024-05-08' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next-fixes for v6.10-rc1:
- panthor fixes.
- Reverting Kconfig changes, and moving drm options to submenu.
- Hide physical fb address in fb helper.
- zynqmp bridge fix.
- Revert broken ti-sn65dsi83 fix.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fe630414-d13e-4052-86f3-ce3155eb3e44@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/meson')
| -rw-r--r-- | drivers/gpu/drm/meson/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig index 5520b9e3f010..615fdd0ce41b 100644 --- a/drivers/gpu/drm/meson/Kconfig +++ b/drivers/gpu/drm/meson/Kconfig @@ -13,9 +13,9 @@ config DRM_MESON config DRM_MESON_DW_HDMI tristate "HDMI Synopsys Controller support for Amlogic Meson Display" - depends on DRM_DW_HDMI depends on DRM_MESON default y if DRM_MESON + select DRM_DW_HDMI imply DRM_DW_HDMI_I2S_AUDIO config DRM_MESON_DW_MIPI_DSI |