From 363446f9dac44107aa8cd6cf157aa23240d83079 Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Fri, 8 Dec 2023 17:56:23 +0000 Subject: [PATCH] device/community/sdm845: enable console to workaround display init issue (MR 4610) See edge blog post https://gitlab.com/postmarketOS/postmarketos.org/-/merge_requests/236 upstream bug: https://gitlab.freedesktop.org/drm/msm/-/issues/46 Signed-off-by: Caleb Connolly [ci:skip-build]: already built successfully in CI --- device/community/device-oneplus-enchilada/APKBUILD | 4 ++-- device/community/device-oneplus-enchilada/deviceinfo | 4 +++- device/community/device-oneplus-fajita/APKBUILD | 4 ++-- device/community/device-oneplus-fajita/deviceinfo | 4 +++- device/community/device-shift-axolotl/APKBUILD | 4 ++-- device/community/device-shift-axolotl/deviceinfo | 4 +++- device/community/device-xiaomi-beryllium/APKBUILD | 4 ++-- device/community/device-xiaomi-beryllium/deviceinfo | 4 +++- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD index b9d280b63..04628b5d4 100644 --- a/device/community/device-oneplus-enchilada/APKBUILD +++ b/device/community/device-oneplus-enchilada/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-oneplus-enchilada pkgdesc="OnePlus 6" pkgver=12 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -57,7 +57,7 @@ pmtest() { sha512sums=" e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1 10-unl0kr.conf -71b4d74cebe22556b2c819fdb6b279366c9a566cb077f6e6e80c0c0b2e7c7fca48ea23ffbacca5cce4c636d8f3e66ad8f66ce36e954644242f6b5a71c89f9ed6 deviceinfo +83fc698ebeda6245abc2a653eeff97b3b996d06dd7731386a07d102937f9b005c7277e0dece05ff359d9ff109a1d9ed7791fc510b146354df179804aadb5642c deviceinfo ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d modules-initfs fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887 q6voiced.conf " diff --git a/device/community/device-oneplus-enchilada/deviceinfo b/device/community/device-oneplus-enchilada/deviceinfo index dcc738f06..b1e96a0d2 100644 --- a/device/community/device-oneplus-enchilada/deviceinfo +++ b/device/community/device-oneplus-enchilada/deviceinfo @@ -18,7 +18,9 @@ deviceinfo_screen_height="2280" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="console=null" +# FIXME: Console enabled to workaround a race condition with display initialisation +# See https://gitlab.freedesktop.org/drm/msm/-/issues/46 +deviceinfo_kernel_cmdline="console=ttyMSM0,115200" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false" diff --git a/device/community/device-oneplus-fajita/APKBUILD b/device/community/device-oneplus-fajita/APKBUILD index 2d8e0546a..9695e5df6 100644 --- a/device/community/device-oneplus-fajita/APKBUILD +++ b/device/community/device-oneplus-fajita/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-oneplus-fajita pkgdesc="OnePlus 6T" pkgver=11 -pkgrel=2 +pkgrel=3 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -57,7 +57,7 @@ pmtest() { sha512sums=" e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1 10-unl0kr.conf -53f2c5223fd708990b7642c3c83a5a58388e810d179aa24fae4e9fe0f187008a32511c8294819f8933c3377a0c2ebd5512fb03a3900fde78662bd93d034338df deviceinfo +07e3d79715befccd1e7393908c06f88ac8468d1ce6cb96138e3a04e6f8274889db169f5daf05b04b633bcc9e85d11ea5c2017b84bc0ae86a8fad80b05794d0d8 deviceinfo ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d modules-initfs fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887 q6voiced.conf " diff --git a/device/community/device-oneplus-fajita/deviceinfo b/device/community/device-oneplus-fajita/deviceinfo index eb0934ebf..56bc1e7d1 100644 --- a/device/community/device-oneplus-fajita/deviceinfo +++ b/device/community/device-oneplus-fajita/deviceinfo @@ -18,7 +18,9 @@ deviceinfo_screen_height="2340" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="console=null" +# FIXME: Console enabled to workaround a race condition with display initialisation +# See https://gitlab.freedesktop.org/drm/msm/-/issues/46 +deviceinfo_kernel_cmdline="console=ttyMSM0,115200" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false" diff --git a/device/community/device-shift-axolotl/APKBUILD b/device/community/device-shift-axolotl/APKBUILD index 6421648ad..80658b551 100644 --- a/device/community/device-shift-axolotl/APKBUILD +++ b/device/community/device-shift-axolotl/APKBUILD @@ -5,7 +5,7 @@ pkgname=device-shift-axolotl pkgdesc="SHIFT6mq" pkgver=12 -pkgrel=2 +pkgrel=3 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -58,7 +58,7 @@ pmtest() { } sha512sums=" -88e5a1f014e48c811df46e94e09016f4f65cd99eb7e0baff4f7aaf9ee9cec2f8d9d9849aa23b6a28dac9631eeace530c5d914b538f186acbbd1e907d9041cc7e deviceinfo +e3f8a8d556a3c3134791693f2003aa64465b6971f7e353f547d6f1cbe3a0a0225a225e40ee4dbed951c0fa67f5a4636fd15953f6a3fe23d4f098fa1d39baa8f5 deviceinfo 4dc84207c5ca84b33b74139c8b0c9ce5baa8bcb1068df9943c478c02abcf8daccb88e06af63f120a434a115e277008e899305bd5239d8669436cb269889040e9 modules-initfs 2a3cbdad5aa91181d24a4e56e63986af6accf887c64fa4d1b6ddad1926e29050243c4b1e2fd892d38ca7c16e24dff8545a16552e5749ae31b6d01bf428468e51 q6voiced.conf " diff --git a/device/community/device-shift-axolotl/deviceinfo b/device/community/device-shift-axolotl/deviceinfo index b793a1fa3..1f557fcbe 100644 --- a/device/community/device-shift-axolotl/deviceinfo +++ b/device/community/device-shift-axolotl/deviceinfo @@ -20,7 +20,9 @@ deviceinfo_screen_height="2160" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="console=null" +# FIXME: Console enabled to workaround a race condition with display initialisation +# See https://gitlab.freedesktop.org/drm/msm/-/issues/46 +deviceinfo_kernel_cmdline="console=ttyMSM0,115200" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false" diff --git a/device/community/device-xiaomi-beryllium/APKBUILD b/device/community/device-xiaomi-beryllium/APKBUILD index 75a4f43b9..7030befa1 100644 --- a/device/community/device-xiaomi-beryllium/APKBUILD +++ b/device/community/device-xiaomi-beryllium/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-xiaomi-beryllium pkgdesc="Xiaomi Poco F1" pkgver=10 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -60,7 +60,7 @@ kernel_ebbg() { } sha512sums=" -912265b7255314f0d68bee23061665a8c386ce53a0db8433ca91ea17ea0aef475c6f82fce884648ad212cb72bdd60242c498fdcbce642f43467f2a30cc9a975b deviceinfo +3d6247e3d1d045fea5cec78dd2a41b4cf81a84fa27550e9502d44152fbfa8246302d5ecb52837a05652a599a6e11dd87acf656b2235dff9dd0717cedb7afd8ab deviceinfo cab76675b9c48eb1ce0691b31667d17ee73ecf21439a7f7c9c2ba96344e3bf4ad713ebc685298d6e32ad589ba26f429cd6b0d200338b50d136ad1a29758e4214 modules-initfs.ebbg 175a7d859956a029b91a1105b93c4113b07ab5cfe932294dd369808059ed03471625f64ce90e5146a65c0bb26417470d8f7c02e48dfacf2d016ce5b2c28cee76 modules-initfs.tianma 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98 q6voiced.conf diff --git a/device/community/device-xiaomi-beryllium/deviceinfo b/device/community/device-xiaomi-beryllium/deviceinfo index c6878ba65..02d1522f2 100644 --- a/device/community/device-xiaomi-beryllium/deviceinfo +++ b/device/community/device-xiaomi-beryllium/deviceinfo @@ -23,7 +23,9 @@ deviceinfo_rootfs_image_sector_size="4096" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="console=null PMOS_NO_OUTPUT_REDIRECT" +# FIXME: Console enabled to workaround a race condition with display initialisation +# See https://gitlab.freedesktop.org/drm/msm/-/issues/46 +deviceinfo_kernel_cmdline="console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_mtk_mkimage="false"