{bq-paella,wileyfox-crackling,xiaomi-wt88047}: remove modprobe.conf (MR 1871)

The modprobe.conf is not necessary on those devices because they already
load the panel module using deviceinfo_modules_initfs. Let's skip the
modprobe.conf in that case so we don't need to add all panels in two places.
This commit is contained in:
Minecrell 2021-01-11 20:33:35 +01:00 committed by Bart Ribbers
parent 2305bc9762
commit 7bef094fae
No known key found for this signature in database
GPG key ID: 699D16185DAFAE61
6 changed files with 6 additions and 69 deletions

View file

@ -11,7 +11,7 @@ arch="aarch64"
options="!check !archcheck" options="!check !archcheck"
depends="postmarketos-base mkbootimg soc-qcom-msm8916" depends="postmarketos-base mkbootimg soc-qcom-msm8916"
makedepends="devicepkg-dev" makedepends="devicepkg-dev"
source="deviceinfo modprobe.conf" source="deviceinfo"
subpackages=" subpackages="
$pkgname-kernel-mainline:kernel_mainline $pkgname-kernel-mainline:kernel_mainline
$pkgname-kernel-mainline-modem:kernel_mainline_modem $pkgname-kernel-mainline-modem:kernel_mainline_modem
@ -53,5 +53,4 @@ nonfree_firmware_modem() {
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }
sha512sums="3820751ffde4e111d44a8edde789a6ea3d9f4f582f8a9c3bb63ad2621f79ee43d436e97c90d791611ed10c2c28ca1c0a363bcf7b7d563046510f7ff778ac6f5e deviceinfo sha512sums="3820751ffde4e111d44a8edde789a6ea3d9f4f582f8a9c3bb63ad2621f79ee43d436e97c90d791611ed10c2c28ca1c0a363bcf7b7d563046510f7ff778ac6f5e deviceinfo"
84ab0cbcdcab61aaceabff46d2c13aa29242a2eeab2f666ee996041f1969396a8124228c204d81aaf0b6427ee51b8a70bfdaa11b53c94390263d8af96a2fd511 modprobe.conf"

View file

@ -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-yushun-nt35520

View file

@ -11,7 +11,7 @@ arch="aarch64"
options="!check !archcheck" options="!check !archcheck"
depends="postmarketos-base mkbootimg soc-qcom-msm8916" depends="postmarketos-base mkbootimg soc-qcom-msm8916"
makedepends="devicepkg-dev" makedepends="devicepkg-dev"
source="deviceinfo modprobe.conf" source="deviceinfo"
subpackages=" subpackages="
$pkgname-kernel-mainline:kernel_mainline $pkgname-kernel-mainline:kernel_mainline
$pkgname-kernel-mainline-modem:kernel_mainline_modem $pkgname-kernel-mainline-modem:kernel_mainline_modem
@ -52,5 +52,4 @@ nonfree_firmware_modem() {
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }
sha512sums="2b2b3ca29bfbe70c47550de1736595b7b613a34728e2339e45baa3188615531cca17690b6c85118aecc0dcc695a1586f49a806663eea841612b17ef7a1ca595c deviceinfo sha512sums="2b2b3ca29bfbe70c47550de1736595b7b613a34728e2339e45baa3188615531cca17690b6c85118aecc0dcc695a1586f49a806663eea841612b17ef7a1ca595c deviceinfo"
a033c958c7539c7f2ce0b1f5ee3977900f8a71a02e9ff5e7f32aaeb7e3687e1765034a7c30477c050e3e0af67e534ecc2984eecbfce34c689247c24f69149d27 modprobe.conf"

View file

@ -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-booyi-otm1287

View file

@ -9,7 +9,7 @@ arch="aarch64"
options="!check !archcheck" options="!check !archcheck"
depends="postmarketos-base mkbootimg soc-qcom-msm8916" depends="postmarketos-base mkbootimg soc-qcom-msm8916"
makedepends="devicepkg-dev" makedepends="devicepkg-dev"
source="deviceinfo modprobe.conf" source="deviceinfo"
subpackages=" subpackages="
$pkgname-kernel-mainline:kernel_mainline $pkgname-kernel-mainline:kernel_mainline
$pkgname-kernel-mainline-modem-wt86047:kernel_mainline_modem_wt86047 $pkgname-kernel-mainline-modem-wt86047:kernel_mainline_modem_wt86047
@ -68,5 +68,4 @@ nonfree_firmware_modem_wt88047() {
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }
sha512sums="17bf542a3446ef35515bf9bca2849ae5cb95306caef7c8c57101c8d0ea40ba2baf71767f0e652876519a439cacad0d877fac8d40373cae5d1b014a0383896a57 deviceinfo sha512sums="17bf542a3446ef35515bf9bca2849ae5cb95306caef7c8c57101c8d0ea40ba2baf71767f0e652876519a439cacad0d877fac8d40373cae5d1b014a0383896a57 deviceinfo"
df15ed95ee31ac2e565d21056493d9c7b264491f5d446bafe6684ae80750d408a0de7370d31323c75d50eee5ac0f97010c198d3c28285898d7762b822ef7181f modprobe.conf"

View file

@ -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-xiaomi-r61308