6.9-stable patches

added patches:
	revert-drm-make-drivers-depends-on-drm_dw_hdmi.patch

diff --git a/queue-6.9/revert-drm-make-drivers-depends-on-drm_dw_hdmi.patch b/queue-6.9/revert-drm-make-drivers-depends-on-drm_dw_hdmi.patch
new file mode 100644 (file)
index 0000000..da9b7d1
--- /dev/null
+++ b/queue-6.9/revert-drm-make-drivers-depends-on-drm_dw_hdmi.patch
@@ -0,0 +1,128 @@
+From 8f7f115596d3dccedc06f5813e0269734f5cc534 Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+Date: Mon, 22 Apr 2024 12:30:38 +0200
+Subject: Revert "drm: Make drivers depends on DRM_DW_HDMI"
+
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+
+commit 8f7f115596d3dccedc06f5813e0269734f5cc534 upstream.
+
+This reverts commit c0e0f139354c01e0213204e4a96e7076e5a3e396, as helper
+code should always be selected by the driver that needs it, for the
+convenience of the final user configuring a kernel.
+
+The user who configures a kernel should not need to know which helpers
+are needed for the driver he is interested in.  Making a driver depend
+on helper code means that the user needs to know which helpers to enable
+first, which is very user-unfriendly.
+
+Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Acked-by: Arnd Bergmann <arnd@arndb.de>
+Link: https://patchwork.freedesktop.org/patch/msgid/bd93d43b07f8ed6368119f4a5ddac2ee80debe53.1713780345.git.geert+renesas@glider.be
+Signed-off-by: Maxime Ripard <mripard@kernel.org>
+Cc: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/bridge/imx/Kconfig      |    4 ++--
+ drivers/gpu/drm/imx/ipuv3/Kconfig       |    5 ++---
+ drivers/gpu/drm/ingenic/Kconfig         |    2 +-
+ drivers/gpu/drm/meson/Kconfig           |    2 +-
+ drivers/gpu/drm/renesas/rcar-du/Kconfig |    2 +-
+ drivers/gpu/drm/rockchip/Kconfig        |    2 +-
+ drivers/gpu/drm/sun4i/Kconfig           |    2 +-
+ 7 files changed, 9 insertions(+), 10 deletions(-)
+
+--- a/drivers/gpu/drm/bridge/imx/Kconfig
++++ b/drivers/gpu/drm/bridge/imx/Kconfig
+@@ -5,9 +5,9 @@ config DRM_IMX_LDB_HELPER
+ 
+ config DRM_IMX8MP_DW_HDMI_BRIDGE
+       tristate "Freescale i.MX8MP HDMI-TX bridge support"
+-      depends on COMMON_CLK
+-      depends on DRM_DW_HDMI
+       depends on OF
++      depends on COMMON_CLK
++      select DRM_DW_HDMI
+       imply DRM_IMX8MP_HDMI_PVI
+       imply PHY_FSL_SAMSUNG_HDMI_PHY
+       help
+--- a/drivers/gpu/drm/imx/ipuv3/Kconfig
++++ b/drivers/gpu/drm/imx/ipuv3/Kconfig
+@@ -35,8 +35,7 @@ config DRM_IMX_LDB
+ 
+ config DRM_IMX_HDMI
+       tristate "Freescale i.MX DRM HDMI"
+-      depends on DRM_DW_HDMI
+-      depends on DRM_IMX
+-      depends on OF
++      select DRM_DW_HDMI
++      depends on DRM_IMX && OF
+       help
+         Choose this if you want to use HDMI on i.MX6.
+--- a/drivers/gpu/drm/ingenic/Kconfig
++++ b/drivers/gpu/drm/ingenic/Kconfig
+@@ -27,8 +27,8 @@ config DRM_INGENIC_IPU
+ 
+ config DRM_INGENIC_DW_HDMI
+       tristate "Ingenic specific support for Synopsys DW HDMI"
+-      depends on DRM_DW_HDMI
+       depends on MACH_JZ4780
++      select DRM_DW_HDMI
+       help
+         Choose this option to enable Synopsys DesignWare HDMI based driver.
+         If you want to enable HDMI on Ingenic JZ4780 based SoC, you should
+--- 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
+--- a/drivers/gpu/drm/renesas/rcar-du/Kconfig
++++ b/drivers/gpu/drm/renesas/rcar-du/Kconfig
+@@ -25,8 +25,8 @@ config DRM_RCAR_CMM
+ config DRM_RCAR_DW_HDMI
+       tristate "R-Car Gen3 and RZ/G2 DU HDMI Encoder Support"
+       depends on DRM && OF
+-      depends on DRM_DW_HDMI
+       depends on DRM_RCAR_DU || COMPILE_TEST
++      select DRM_DW_HDMI
+       help
+         Enable support for R-Car Gen3 or RZ/G2 internal HDMI encoder.
+ 
+--- a/drivers/gpu/drm/rockchip/Kconfig
++++ b/drivers/gpu/drm/rockchip/Kconfig
+@@ -7,6 +7,7 @@ config DRM_ROCKCHIP
+       select DRM_PANEL
+       select VIDEOMODE_HELPERS
+       select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
++      select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
+       select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
+       select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI
+       select GENERIC_PHY_MIPI_DPHY if ROCKCHIP_DW_MIPI_DSI
+@@ -56,7 +57,6 @@ config ROCKCHIP_CDN_DP
+ 
+ config ROCKCHIP_DW_HDMI
+       bool "Rockchip specific extensions for Synopsys DW HDMI"
+-      depends on DRM_DW_HDMI
+       help
+         This selects support for Rockchip SoC specific extensions
+         for the Synopsys DesignWare HDMI driver. If you want to
+--- a/drivers/gpu/drm/sun4i/Kconfig
++++ b/drivers/gpu/drm/sun4i/Kconfig
+@@ -57,8 +57,8 @@ config DRM_SUN6I_DSI
+ config DRM_SUN8I_DW_HDMI
+       tristate "Support for Allwinner version of DesignWare HDMI"
+       depends on DRM_SUN4I
+-      depends on DRM_DW_HDMI
+       default DRM_SUN4I
++      select DRM_DW_HDMI
+       help
+         Choose this option if you have an Allwinner SoC with the
+         DesignWare HDMI controller. SoCs that support HDMI and

diff --git a/queue-6.9/series b/queue-6.9/series
index abdb61a6d269bc5b5efc2fb1a99354a1e739c3f5..1b90c113cb852e7e19762a291abd9beb4542ddb1 100644 (file)
--- a/queue-6.9/series
+++ b/queue-6.9/series
@@ -362,3 +362,4 @@ hwmon-intel-m10-bmc-hwmon-fix-multiplier-for-n6000-b.patch
 hwmon-shtc1-fix-property-misspelling.patch
 riscv-prevent-pt_regs-corruption-for-secondary-idle-.patch
 alsa-seq-ump-fix-swapped-song-position-pointer-data.patch
+revert-drm-make-drivers-depends-on-drm_dw_hdmi.patch