From 253e49ed9e29cd474f1f359cef40ebfe96771235 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Oct 05 2022 09:01:28 +0000 Subject: Revert "sysfb: Enable boot time VESA graphic mode selection (bsc#1129770)" This reverts commit 8d1c33d1ed3d4b198344cf4cf8763447532f6b90 since it breaks the build --- diff --git a/config/arm64/default b/config/arm64/default index 2768653..207340b 100644 --- a/config/arm64/default +++ b/config/arm64/default @@ -343,6 +343,7 @@ CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y # CONFIG_BLK_SED_OPAL is not set +# CONFIG_BLK_DEV_FD_RAWCMD is not set # # Partition Types @@ -2589,6 +2590,7 @@ CONFIG_FSL_DPAA_ETH=m CONFIG_FSL_DPAA2_ETH=m CONFIG_FSL_DPAA2_PTP_CLOCK=m CONFIG_NET_VENDOR_GOOGLE=y +CONFIG_GVE=m CONFIG_NET_VENDOR_HISILICON=y CONFIG_HIX5HD2_GMAC=m CONFIG_HISI_FEMAC=m @@ -5424,6 +5426,7 @@ CONFIG_FB_NOTIFY=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y diff --git a/config/ppc64le/debug b/config/ppc64le/debug index 0fc76ef..1ee4fe1 100644 --- a/config/ppc64le/debug +++ b/config/ppc64le/debug @@ -57,4 +57,3 @@ CONFIG_TTY_PRINTK=y CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_MODULES=y CONFIG_MODULE_SIG=y -CONFIG_MODULE_SIG_HASH="sha256" diff --git a/config/ppc64le/default b/config/ppc64le/default index 8f229a7..8d11836 100644 --- a/config/ppc64le/default +++ b/config/ppc64le/default @@ -381,6 +381,7 @@ CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y CONFIG_BLK_SED_OPAL=y +# CONFIG_BLK_DEV_FD_RAWCMD is not set # # Partition Types @@ -1671,7 +1672,6 @@ CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_NULL_BLK_FAULT_INJECTION=y CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3654,6 +3654,7 @@ CONFIG_FB_NOTIFY=y CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y diff --git a/config/s390x/default b/config/s390x/default index 6be035a..bbb5af4 100644 --- a/config/s390x/default +++ b/config/s390x/default @@ -314,6 +314,7 @@ CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y CONFIG_BLK_SED_OPAL=y +# CONFIG_BLK_DEV_FD_RAWCMD is not set # # Partition Types @@ -1582,6 +1583,7 @@ CONFIG_LIBFCOE=m # CONFIG_SCSI_QLOGIC_1280 is not set # CONFIG_SCSI_QLA_FC is not set # CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_AM53C974 is not set # CONFIG_SCSI_WD719X is not set @@ -1735,6 +1737,7 @@ CONFIG_NET_VENDOR_CAVIUM=y CONFIG_NET_VENDOR_EZCHIP=y # CONFIG_NET_VENDOR_EXAR is not set # CONFIG_NET_VENDOR_GOOGLE is not set +# CONFIG_GVE is not set # CONFIG_NET_VENDOR_HP is not set CONFIG_NET_VENDOR_INTEL=y # CONFIG_E100 is not set @@ -2263,6 +2266,10 @@ CONFIG_DRM_TTM=m # CONFIG_DRM_AMDGPU is not set # +# ACP (Audio CoProcessor) Configuration +# + +# # AMD Library routines # # CONFIG_CHASH is not set @@ -2301,6 +2308,7 @@ CONFIG_FB_NOTIFY=y CONFIG_FB=m # CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set CONFIG_FB_CFB_FILLRECT=m CONFIG_FB_CFB_COPYAREA=m CONFIG_FB_CFB_IMAGEBLIT=m @@ -3431,8 +3439,8 @@ CONFIG_KVM_ASYNC_PF_SYNC=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_HAVE_KVM_INVALID_WAKEUPS=y -CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y CONFIG_HAVE_KVM_NO_POLL=y +CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m # CONFIG_KVM_S390_UCONTROL is not set diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump index bcf03fa..020cbe6 100644 --- a/config/s390x/zfcpdump +++ b/config/s390x/zfcpdump @@ -248,6 +248,7 @@ CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y # CONFIG_BLK_SED_OPAL is not set +# CONFIG_BLK_DEV_FD_RAWCMD is not set # # Partition Types @@ -1277,8 +1278,8 @@ CONFIG_KVM_ASYNC_PF_SYNC=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_HAVE_KVM_INVALID_WAKEUPS=y -CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y CONFIG_HAVE_KVM_NO_POLL=y +CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y # CONFIG_KVM_S390_UCONTROL is not set diff --git a/config/x86_64/debug b/config/x86_64/debug index b576877..0c92705 100644 --- a/config/x86_64/debug +++ b/config/x86_64/debug @@ -82,5 +82,4 @@ CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y CONFIG_XFS_DEBUG=y CONFIG_MODULES=y CONFIG_MODULE_SIG=y -CONFIG_MODULE_SIG_HASH="sha256" CONFIG_EFI_STUB=y diff --git a/config/x86_64/default b/config/x86_64/default index 50364ff..8d8d99f 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -390,6 +390,7 @@ CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y CONFIG_BLK_SED_OPAL=y +# CONFIG_BLK_DEV_FD_RAWCMD is not set # # Partition Types @@ -464,8 +465,9 @@ CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set CONFIG_RETPOLINE=y -CONFIG_SLS=y +CONFIG_CC_HAS_SLS=y CONFIG_CC_HAS_RETURN_THUNK=y +CONFIG_SLS=y CONFIG_X86_CPU_RESCTRL=y CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_NUMACHIP is not set @@ -2077,7 +2079,6 @@ CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_NULL_BLK_FAULT_INJECTION=y CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -5214,6 +5215,7 @@ CONFIG_FB_NOTIFY=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set +CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y diff --git a/patches.suse/0003-sysfb-Enable-boot-time-VESA-graphic-mode-selection.patch b/patches.suse/0003-sysfb-Enable-boot-time-VESA-graphic-mode-selection.patch deleted file mode 100644 index d979ce4..0000000 --- a/patches.suse/0003-sysfb-Enable-boot-time-VESA-graphic-mode-selection.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 8b766b0f8eece55155146f7628610ce54a065e0f Mon Sep 17 00:00:00 2001 -From: Michal Suchanek -Date: Fri, 25 Feb 2022 21:51:34 +0100 -Subject: sysfb: Enable boot time VESA graphic mode selection -Git-commit: 8b766b0f8eece55155146f7628610ce54a065e0f -Patch-mainline: v5.19-rc1 -References: bsc#1129770 - -Since switch to simplefb/simpledrm VESA graphic mode selection with vga= -kernel parameter is no longer available with legacy BIOS. - -The x86 realmode boot code enables the VESA graphic modes when option -FB_BOOT_VESA_SUPPORT is enabled. - -This option is selected by vesafb but not simplefb/simpledrm. - -To enable use of VESA modes with simplefb in legacy BIOS boot mode drop -dependency of BOOT_VESA_SUPPORT on FB, also drop the FB_ prefix. Select -the option from sysfb rather than the drivers that depend on it. - -The BOOT_VESA_SUPPORT is not specific to framebuffer but rather to x86 -platform, move it from fbdev to x86 Kconfig. - -Fixes: e3263ab389a7 ("x86: provide platform-devices for boot-framebuffers") -Signed-off-by: Michal Suchanek -Reviewed-by: Javier Martinez Canillas -Acked-by: Borislav Petkov -Signed-off-by: Thomas Zimmermann -Link: https://patchwork.freedesktop.org/patch/msgid/948c39940a4e99f5b43bdbcbe537faae71a43e1d.1645822213.git.msuchanek@suse.de -Acked-by: Thomas Zimmermann ---- - arch/x86/Kconfig | 6 ++++++ - arch/x86/boot/video-vesa.c | 4 ++-- - drivers/firmware/Kconfig | 1 + - drivers/video/fbdev/Kconfig | 13 ++----------- - 4 files changed, 11 insertions(+), 13 deletions(-) - ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -937,6 +937,12 @@ config IOMMU_HELPER - def_bool y - depends on CALGARY_IOMMU || GART_IOMMU - -+config BOOT_VESA_SUPPORT -+ bool -+ help -+ If true, at least one selected framebuffer driver can take advantage -+ of VESA video modes set at an early boot stage via the vga= parameter. -+ - config MAXSMP - bool "Enable Maximum number of SMP Processors and NUMA Nodes" - depends on X86_64 && SMP && DEBUG_KERNEL ---- a/arch/x86/boot/video-vesa.c -+++ b/arch/x86/boot/video-vesa.c -@@ -85,7 +85,7 @@ static int vesa_probe(void) - (vminfo.memory_layout == 4 || - vminfo.memory_layout == 6) && - vminfo.memory_planes == 1) { --#ifdef CONFIG_FB_BOOT_VESA_SUPPORT -+#ifdef CONFIG_BOOT_VESA_SUPPORT - /* Graphics mode, color, linear frame buffer - supported. Only register the mode if - if framebuffer is configured, however, -@@ -123,7 +123,7 @@ static int vesa_set_mode(struct mode_inf - if ((vminfo.mode_attr & 0x15) == 0x05) { - /* It's a supported text mode */ - is_graphic = 0; --#ifdef CONFIG_FB_BOOT_VESA_SUPPORT -+#ifdef CONFIG_BOOT_VESA_SUPPORT - } else if ((vminfo.mode_attr & 0x99) == 0x99) { - /* It's a graphics mode with linear frame buffer */ - is_graphic = 1; ---- a/drivers/firmware/Kconfig -+++ b/drivers/firmware/Kconfig -@@ -240,6 +240,7 @@ config TI_SCI_PROTOCOL - - config HAVE_ARM_SMCCC - bool -+ select BOOT_VESA_SUPPORT - - source "drivers/firmware/broadcom/Kconfig" - source "drivers/firmware/google/Kconfig" ---- a/drivers/video/fbdev/Kconfig -+++ b/drivers/video/fbdev/Kconfig -@@ -73,14 +73,6 @@ config FB_DDC - select I2C - default n - --config FB_BOOT_VESA_SUPPORT -- bool -- depends on FB -- default n -- ---help--- -- If true, at least one selected framebuffer driver can take advantage -- of VESA video modes set at an early boot stage via the vga= parameter. -- - config FB_CFB_FILLRECT - tristate - depends on FB -@@ -762,7 +754,6 @@ config FB_VESA - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT -- select FB_BOOT_VESA_SUPPORT - help - This is the frame buffer device driver for generic VESA 2.0 - compliant graphic cards. The older VESA 1.2 cards are not supported. -@@ -1190,7 +1181,7 @@ config FB_INTEL - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT -- select FB_BOOT_VESA_SUPPORT if FB_INTEL = y -+ select BOOT_VESA_SUPPORT if FB_INTEL = y - depends on !DRM_I915 - help - This driver supports the on-board graphics built in to the Intel -@@ -1519,7 +1510,7 @@ config FB_SIS - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT -- select FB_BOOT_VESA_SUPPORT if FB_SIS = y -+ select BOOT_VESA_SUPPORT if FB_SIS = y - select FB_SIS_300 if !FB_SIS_315 - help - This is the frame buffer device driver for the SiS 300, 315, 330 diff --git a/series.conf b/series.conf index ca5bccc..1807538 100644 --- a/series.conf +++ b/series.conf @@ -61649,7 +61649,6 @@ patches.suse/ext4-fix-bug_on-in-__es_tree_search.patch patches.suse/iomap-iomap_write_failed-fix.patch patches.suse/Bluetooth-hci_qca-Use-del_timer_sync-before-freeing.patch - patches.suse/0003-sysfb-Enable-boot-time-VESA-graphic-mode-selection.patch patches.suse/scsi-qla2xxx-Remove-free_sg-command-flag.patch patches.suse/scsi-ufs-qcom-Fix-ufs_qcom_resume.patch patches.suse/scsi-qla2xxx-Remove-unneeded-flush_workqueue.patch