From 7a8b981dba5fb938bbc7cd29c484706e57279e83 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sun, 11 Apr 2021 20:13:34 +0200 Subject: [PATCH] community/samsung-serranovelte: 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. --- .../device-samsung-serranovelte/APKBUILD | 9 ++++----- .../device-samsung-serranovelte/deviceinfo | 5 +---- .../device-samsung-serranovelte/modprobe.conf | 20 ------------------- 3 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 device/community/device-samsung-serranovelte/modprobe.conf diff --git a/device/community/device-samsung-serranovelte/APKBUILD b/device/community/device-samsung-serranovelte/APKBUILD index e9f06b410..9479fdd5b 100644 --- a/device/community/device-samsung-serranovelte/APKBUILD +++ b/device/community/device-samsung-serranovelte/APKBUILD @@ -2,15 +2,15 @@ # Maintainer: Minecrell pkgname=device-samsung-serranovelte pkgdesc="Samsung Galaxy S4 Mini Value Edition" -pkgver=3 -pkgrel=3 +pkgver=4 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends="postmarketos-base mkbootimg soc-qcom-msm8916" makedepends="devicepkg-dev" -source="deviceinfo modprobe.conf rootston.ini" +source="deviceinfo rootston.ini" subpackages=" $pkgname-kernel-mainline:kernel_mainline $pkgname-kernel-mainline-modem:kernel_mainline_modem @@ -58,6 +58,5 @@ phosh() { "$subpkgdir"/etc/phosh/rootston.ini } -sha512sums="c9adc1faf7af603fff45e08e56ddcce07ce1f84669a02745e6ab3028ec07b17ccc547bada7a711f00882be52240e29fdbfa2d84871d45eda2741f6d3c12ea858 deviceinfo -15df51108ce38aabd8115ada93a728e2a94699ccdf11df2e86bd0a99202b0bd7d924e38e35ca62cbb257368f422034891056e09eeef9c4f8b437a9f2db429b21 modprobe.conf +sha512sums="53496eed0ba8eee3a20940845222c1a011c69ea00d4cd2999709956e439ef53686524efe8406aa2e8cf3f2f0289e6293e329a83b006a88004a5cfc2f0f1cb7a5 deviceinfo 94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea rootston.ini" diff --git a/device/community/device-samsung-serranovelte/deviceinfo b/device/community/device-samsung-serranovelte/deviceinfo index 5c7f10963..7ef93da71 100644 --- a/device/community/device-samsung-serranovelte/deviceinfo +++ b/device/community/device-samsung-serranovelte/deviceinfo @@ -9,7 +9,7 @@ deviceinfo_year="2015" deviceinfo_dtb_mainline="qcom-msm8916-samsung-serranovelte" deviceinfo_dtb_mainline_modem="qcom-msm8916-samsung-serranovelte-modem" deviceinfo_append_dtb="true" -deviceinfo_modules_initfs="" +deviceinfo_modules_initfs="panel-samsung-s6e88a0-ams427ap24 msm zinitix" deviceinfo_arch="armv7" # Device related @@ -20,9 +20,6 @@ deviceinfo_screen_width="540" deviceinfo_screen_height="960" deviceinfo_getty="ttyMSM0;115200" -# MSM DRM cannot take over the framebuffer from the bootloader at the moment -deviceinfo_no_framebuffer="true" - # The panel on this device displays everything horizontally flipped for some reason (WTF Samsung?). # Make it look normal by instructing the kernel to flip the screen using video=540x960,reflect_x. deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 video=540x960,reflect_x PMOS_NO_OUTPUT_REDIRECT" diff --git a/device/community/device-samsung-serranovelte/modprobe.conf b/device/community/device-samsung-serranovelte/modprobe.conf deleted file mode 100644 index 8146c0f00..000000000 --- a/device/community/device-samsung-serranovelte/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-s6e88a0-ams427ap24