From 2b54e057b538bd4608ee291af6ce5ae69b83ae37 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sun, 11 Apr 2021 20:13:08 +0200 Subject: [PATCH] community/samsung-a5(u)lte: enable screen in initfs (MR 2110) As of MR 2039, the kernel modules are now stripped (INSTALL_MOD_STRIP=1). It turns out that this massively reduces their size so that including the panel + touchscreen modules in the initfs still fits into the partition. This allows the splash screen and osk-sdl to work correctly. --- .../community/device-samsung-a5lte/APKBUILD | 9 ++++----- .../community/device-samsung-a5lte/deviceinfo | 5 +---- .../device-samsung-a5lte/modprobe.conf | 20 ------------------- .../community/device-samsung-a5ulte/APKBUILD | 9 ++++----- .../device-samsung-a5ulte/deviceinfo | 5 +---- .../device-samsung-a5ulte/modprobe.conf | 20 ------------------- 6 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 device/community/device-samsung-a5lte/modprobe.conf delete mode 100644 device/community/device-samsung-a5ulte/modprobe.conf diff --git a/device/community/device-samsung-a5lte/APKBUILD b/device/community/device-samsung-a5lte/APKBUILD index 23436f168..9ac605518 100644 --- a/device/community/device-samsung-a5lte/APKBUILD +++ b/device/community/device-samsung-a5lte/APKBUILD @@ -3,15 +3,15 @@ # Co-Maintainer: Minecrell pkgname=device-samsung-a5lte pkgdesc="Samsung Galaxy A5 (SM-A500F)" -pkgver=3 -pkgrel=2 +pkgver=4 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends="postmarketos-base mkbootimg soc-qcom-msm8916" makedepends="devicepkg-dev" -source="deviceinfo modprobe.conf" +source="deviceinfo" subpackages=" $pkgname-kernel-mainline:kernel_mainline $pkgname-kernel-mainline-modem:kernel_mainline_modem @@ -52,5 +52,4 @@ nonfree_firmware_modem() { mkdir "$subpkgdir" } -sha512sums="4d24cbd34ec2ce958444704c658405a7cf57a140f417abbec2c2ea3ec2842ec31703d591451fc7e381e53acdf4672e489fd09b8c7a0af6e26c552fdba619099a deviceinfo -2dcb1b872135fa1861c172782d327b147d7b2705a68fc64300e70299b9926b01be1d76ab03a12d57a53b8dddc2ff67620e80fc6bdfcbb36423dd2afcdbadc0ed modprobe.conf" +sha512sums="f8966469bc1a5b51043e7415312896fea7b480808c4ee3e8d5049b41363f584b4664a752527399c888acac0fb9ab986874174c728b0599556f61afb5e7d678d8 deviceinfo" diff --git a/device/community/device-samsung-a5lte/deviceinfo b/device/community/device-samsung-a5lte/deviceinfo index f7c0e4732..dcf4b7179 100644 --- a/device/community/device-samsung-a5lte/deviceinfo +++ b/device/community/device-samsung-a5lte/deviceinfo @@ -11,7 +11,7 @@ deviceinfo_year="2015" deviceinfo_dtb_mainline="qcom/msm8916-samsung-a5u-eur" deviceinfo_dtb_mainline_modem="qcom/msm8916-samsung-a5u-eur-modem" deviceinfo_append_dtb="true" -deviceinfo_modules_initfs="" +deviceinfo_modules_initfs="panel-samsung-ea8061v-ams497ee01 msm mms114" deviceinfo_arch="aarch64" # Device related @@ -22,9 +22,6 @@ deviceinfo_screen_width="720" deviceinfo_screen_height="1280" deviceinfo_getty="ttyMSM0;115200" -# MSM DRM cannot take over the framebuffer from the bootloader at the moment -deviceinfo_no_framebuffer="true" - # Bootloader related deviceinfo_flash_method="fastboot" deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT" diff --git a/device/community/device-samsung-a5lte/modprobe.conf b/device/community/device-samsung-a5lte/modprobe.conf deleted file mode 100644 index 3102cebb7..000000000 --- a/device/community/device-samsung-a5lte/modprobe.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# There is a weird probe issue if both MSM DRM and the panel driver are built -# as modules: When MSM DRM is loaded it registers the DSI bus for the panel. -# At this point the panel is not loaded yet, so the kernel sends an uevent -# to userspace to load the necessary panel module. -# -# This causes some delay until the panel module is loaded, so MSM DRM fails to -# probe temporarily and returns -EPROBE_DEFER (to request probing again later). -# Unfortunately this will also unregister the DSI bus for the panel, and the -# kernel will not try probing MSM DRM + panel again until some other (slow) -# driver loads after MSM DRM. -# -# Usually WCNSS (WiFi/BT) fits that criteria, allowing the display to work. -# But this does not work if the user decides to exclude proprietary firmware. -# -# To avoid this problem we add an explicit soft dependency for MSM DRM -# on the panel module, so modprobe loads the panel module first and MSM DRM -# will immediately find the panel it is looking for. -# -softdep msm pre: panel-samsung-ea8061v-ams497ee01 diff --git a/device/community/device-samsung-a5ulte/APKBUILD b/device/community/device-samsung-a5ulte/APKBUILD index 5541f2a8f..672cb34d0 100644 --- a/device/community/device-samsung-a5ulte/APKBUILD +++ b/device/community/device-samsung-a5ulte/APKBUILD @@ -2,15 +2,15 @@ # Maintainer: Minecrell pkgname=device-samsung-a5ulte pkgdesc="Samsung Galaxy A5 (SM-A500FU)" -pkgver=3 -pkgrel=2 +pkgver=4 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends="postmarketos-base mkbootimg soc-qcom-msm8916" makedepends="devicepkg-dev" -source="deviceinfo modprobe.conf" +source="deviceinfo" subpackages=" $pkgname-kernel-mainline:kernel_mainline $pkgname-kernel-mainline-modem:kernel_mainline_modem @@ -51,5 +51,4 @@ nonfree_firmware_modem() { mkdir "$subpkgdir" } -sha512sums="dbff7874b2cdf22164c27ece38aef65d60ee76a42a17fa6c12fb77dd6c0b41e89f09c0876dcd8528aadba13d301961dc0446ffae0b7951b32d18f77ed1bdf238 deviceinfo -2dcb1b872135fa1861c172782d327b147d7b2705a68fc64300e70299b9926b01be1d76ab03a12d57a53b8dddc2ff67620e80fc6bdfcbb36423dd2afcdbadc0ed modprobe.conf" +sha512sums="e229166e699a5ca68fd5c762b70a25ff8306986d63190a5d9dba7bc296dec5d597d660a37b25a0f39b4722a595678aa0ac35695e50a18a757436e9ad6a2c55e9 deviceinfo" diff --git a/device/community/device-samsung-a5ulte/deviceinfo b/device/community/device-samsung-a5ulte/deviceinfo index 9a7fd8a88..5ba1e9947 100644 --- a/device/community/device-samsung-a5ulte/deviceinfo +++ b/device/community/device-samsung-a5ulte/deviceinfo @@ -9,7 +9,7 @@ deviceinfo_year="2015" deviceinfo_dtb_mainline="qcom/msm8916-samsung-a5u-eur" deviceinfo_dtb_mainline_modem="qcom/msm8916-samsung-a5u-eur-modem" deviceinfo_append_dtb="true" -deviceinfo_modules_initfs="" +deviceinfo_modules_initfs="panel-samsung-ea8061v-ams497ee01 msm mms114" deviceinfo_arch="aarch64" # Device related @@ -20,9 +20,6 @@ deviceinfo_screen_width="720" deviceinfo_screen_height="1280" deviceinfo_getty="ttyMSM0;115200" -# MSM DRM cannot take over the framebuffer from the bootloader at the moment -deviceinfo_no_framebuffer="true" - # Bootloader related deviceinfo_flash_method="fastboot" deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT" diff --git a/device/community/device-samsung-a5ulte/modprobe.conf b/device/community/device-samsung-a5ulte/modprobe.conf deleted file mode 100644 index 3102cebb7..000000000 --- a/device/community/device-samsung-a5ulte/modprobe.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# There is a weird probe issue if both MSM DRM and the panel driver are built -# as modules: When MSM DRM is loaded it registers the DSI bus for the panel. -# At this point the panel is not loaded yet, so the kernel sends an uevent -# to userspace to load the necessary panel module. -# -# This causes some delay until the panel module is loaded, so MSM DRM fails to -# probe temporarily and returns -EPROBE_DEFER (to request probing again later). -# Unfortunately this will also unregister the DSI bus for the panel, and the -# kernel will not try probing MSM DRM + panel again until some other (slow) -# driver loads after MSM DRM. -# -# Usually WCNSS (WiFi/BT) fits that criteria, allowing the display to work. -# But this does not work if the user decides to exclude proprietary firmware. -# -# To avoid this problem we add an explicit soft dependency for MSM DRM -# on the panel module, so modprobe loads the panel module first and MSM DRM -# will immediately find the panel it is looking for. -# -softdep msm pre: panel-samsung-ea8061v-ams497ee01