From: Sasha Levin Date: Thu, 21 Oct 2021 01:12:52 +0000 (-0400) Subject: Drop arm-config-mutli-v7-reenable-fb-dependency.patch X-Git-Tag: v4.4.290~70 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d6ff005bcefa5c0de036f8827b2f6e83449fb51;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm-config-mutli-v7-reenable-fb-dependency.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/arm-config-mutli-v7-reenable-fb-dependency.patch b/queue-5.10/arm-config-mutli-v7-reenable-fb-dependency.patch deleted file mode 100644 index 19c81d2cae8..00000000000 --- a/queue-5.10/arm-config-mutli-v7-reenable-fb-dependency.patch +++ /dev/null @@ -1,44 +0,0 @@ -From eeae00b11f89acbcf7e0adda66e5571a4b154adc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 15 Jun 2021 10:44:34 +0930 -Subject: ARM: config: mutli v7: Reenable FB dependency - -From: Joel Stanley - -[ Upstream commit 8c1768967e2733d55abf449d8abd6f1915ba3539 ] - -DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM -was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for -CONFIG_FB") the select was replaced with a depends on FB, disabling the -drivers that depended on it. - -Renable FB so we get back FB_EFI, FB_WM8505, FB_SH_MOBILE_LCDC, FB_SIMPLE and -VIDEO_VIVID. - -It must be set to y and not a module as the test driver VIDEO_VIVID -requires it to be built in. - -Link: https://lore.kernel.org/r/CAK8P3a18EdBKQdGDOZc9cPKsf=hY8==v2cO0DBE_tyd82Uq-Ng@mail.gmail.com -Signed-off-by: Joel Stanley -Reviewed-by: Arnd Bergmann -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/configs/multi_v7_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig -index a611b0c1e540..b1073fb3a132 100644 ---- a/arch/arm/configs/multi_v7_defconfig -+++ b/arch/arm/configs/multi_v7_defconfig -@@ -701,6 +701,7 @@ CONFIG_DRM_PL111=m - CONFIG_DRM_LIMA=m - CONFIG_DRM_PANFROST=m - CONFIG_DRM_ASPEED_GFX=m -+CONFIG_FB=y - CONFIG_FB_EFI=y - CONFIG_FB_WM8505=y - CONFIG_FB_SH_MOBILE_LCDC=y --- -2.33.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 9bcb71ab65e..e311b74b2d3 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -2,7 +2,6 @@ parisc-math-emu-fix-fall-through-warnings.patch xhci-add-quirk-for-host-controllers-that-don-t-update-endpoint-dcs.patch io_uring-fix-splice_fd_in-checks-backport-typo.patch arm-dts-vexpress-v2p-ca9-fix-the-smb-unit-address.patch -arm-config-mutli-v7-reenable-fb-dependency.patch arm-dts-at91-sama5d2_som1_ek-disable-isc-node-by-def.patch block-decode-queue_flag_hctx_active-in-debugfs-outpu.patch xen-x86-prevent-pvh-type-from-getting-clobbered.patch diff --git a/queue-5.14/arm-config-mutli-v7-reenable-fb-dependency.patch b/queue-5.14/arm-config-mutli-v7-reenable-fb-dependency.patch deleted file mode 100644 index 2574335d8f9..00000000000 --- a/queue-5.14/arm-config-mutli-v7-reenable-fb-dependency.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 32dabe1794f5767b624925abcf461bac3f856e33 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 15 Jun 2021 10:44:34 +0930 -Subject: ARM: config: mutli v7: Reenable FB dependency - -From: Joel Stanley - -[ Upstream commit 8c1768967e2733d55abf449d8abd6f1915ba3539 ] - -DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM -was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for -CONFIG_FB") the select was replaced with a depends on FB, disabling the -drivers that depended on it. - -Renable FB so we get back FB_EFI, FB_WM8505, FB_SH_MOBILE_LCDC, FB_SIMPLE and -VIDEO_VIVID. - -It must be set to y and not a module as the test driver VIDEO_VIVID -requires it to be built in. - -Link: https://lore.kernel.org/r/CAK8P3a18EdBKQdGDOZc9cPKsf=hY8==v2cO0DBE_tyd82Uq-Ng@mail.gmail.com -Signed-off-by: Joel Stanley -Reviewed-by: Arnd Bergmann -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/configs/multi_v7_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig -index bd5775184c03..707fb2c2fdda 100644 ---- a/arch/arm/configs/multi_v7_defconfig -+++ b/arch/arm/configs/multi_v7_defconfig -@@ -721,6 +721,7 @@ CONFIG_DRM_PL111=m - CONFIG_DRM_LIMA=m - CONFIG_DRM_PANFROST=m - CONFIG_DRM_ASPEED_GFX=m -+CONFIG_FB=y - CONFIG_FB_EFI=y - CONFIG_FB_WM8505=y - CONFIG_FB_SH_MOBILE_LCDC=y --- -2.33.0 - diff --git a/queue-5.14/series b/queue-5.14/series index 2fb2c076a8e..9875e5a3249 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -2,7 +2,6 @@ block-mq-deadline-move-dd_queued-to-fix-defined-but-not-used-warning.patch parisc-math-emu-fix-fall-through-warnings.patch sh-pgtable-3level-fix-cast-to-pointer-from-integer-of-different-size.patch arm-dts-vexpress-v2p-ca9-fix-the-smb-unit-address.patch -arm-config-mutli-v7-reenable-fb-dependency.patch arm-dts-at91-sama5d2_som1_ek-disable-isc-node-by-def.patch block-decode-queue_flag_hctx_active-in-debugfs-outpu.patch xen-x86-prevent-pvh-type-from-getting-clobbered.patch diff --git a/queue-5.4/arm-config-mutli-v7-reenable-fb-dependency.patch b/queue-5.4/arm-config-mutli-v7-reenable-fb-dependency.patch deleted file mode 100644 index 5926195f8aa..00000000000 --- a/queue-5.4/arm-config-mutli-v7-reenable-fb-dependency.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 18a10dca9f75336e6285015aea55a4a55220df52 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 15 Jun 2021 10:44:34 +0930 -Subject: ARM: config: mutli v7: Reenable FB dependency - -From: Joel Stanley - -[ Upstream commit 8c1768967e2733d55abf449d8abd6f1915ba3539 ] - -DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM -was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for -CONFIG_FB") the select was replaced with a depends on FB, disabling the -drivers that depended on it. - -Renable FB so we get back FB_EFI, FB_WM8505, FB_SH_MOBILE_LCDC, FB_SIMPLE and -VIDEO_VIVID. - -It must be set to y and not a module as the test driver VIDEO_VIVID -requires it to be built in. - -Link: https://lore.kernel.org/r/CAK8P3a18EdBKQdGDOZc9cPKsf=hY8==v2cO0DBE_tyd82Uq-Ng@mail.gmail.com -Signed-off-by: Joel Stanley -Reviewed-by: Arnd Bergmann -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/configs/multi_v7_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig -index e4c8def9a0a5..32dfc736a4b1 100644 ---- a/arch/arm/configs/multi_v7_defconfig -+++ b/arch/arm/configs/multi_v7_defconfig -@@ -677,6 +677,7 @@ CONFIG_DRM_PL111=m - CONFIG_DRM_LIMA=m - CONFIG_DRM_PANFROST=m - CONFIG_DRM_ASPEED_GFX=m -+CONFIG_FB=y - CONFIG_FB_EFI=y - CONFIG_FB_WM8505=y - CONFIG_FB_SH_MOBILE_LCDC=y --- -2.33.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 823b1407dbb..b58f5ded911 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,7 +1,6 @@ parisc-math-emu-fix-fall-through-warnings.patch net-switchdev-do-not-propagate-bridge-updates-across-bridges.patch tee-optee-fix-missing-devices-unregister-during-optee_remove.patch -arm-config-mutli-v7-reenable-fb-dependency.patch arm-dts-at91-sama5d2_som1_ek-disable-isc-node-by-def.patch xtensa-xtfpga-use-config_use_of-instead-of-config_of.patch xtensa-xtfpga-try-software-restart-before-simulating.patch