From eefbc449ea03b675e372144576fe4515f7c53ffb Mon Sep 17 00:00:00 2001 From: Stephan G Date: Sun, 9 May 2021 19:07:26 +0200 Subject: [PATCH] jolla-sbj: ARGB fix and downstream kernel update (MR 2164) --- .../01_fix-video-argb-setting.patch | 91 +++++++++++++++++++ device/testing/linux-jolla-sbj/APKBUILD | 14 +-- 2 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 device/testing/linux-jolla-sbj/01_fix-video-argb-setting.patch diff --git a/device/testing/linux-jolla-sbj/01_fix-video-argb-setting.patch b/device/testing/linux-jolla-sbj/01_fix-video-argb-setting.patch new file mode 100644 index 000000000..a89148c21 --- /dev/null +++ b/device/testing/linux-jolla-sbj/01_fix-video-argb-setting.patch @@ -0,0 +1,91 @@ +From 79f928baf4e7b0fa8f36276b2f877da2d46a50d0 Mon Sep 17 00:00:00 2001 +From: Thadeu Lima de Souza Cascardo +Date: Mon, 11 Dec 2017 11:00:24 -0200 +Subject: [PATCH] fix video argb setting + +--- + drivers/video/msm/msm_fb.c | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c +index 251a5cbb753d..dcd9262a88f4 100644 +--- a/drivers/video/msm/msm_fb.c ++++ b/drivers/video/msm/msm_fb.c +@@ -1342,16 +1342,16 @@ static int msm_fb_register(struct msm_fb_data_type *mfd) + fix->xpanstep = 1; + fix->ypanstep = 1; + var->vmode = FB_VMODE_NONINTERLACED; +- var->blue.offset = 0; +- var->green.offset = 8; +- var->red.offset = 16; ++ var->blue.offset = 24; ++ var->green.offset = 16; ++ var->red.offset = 8; + var->blue.length = 8; + var->green.length = 8; + var->red.length = 8; + var->blue.msb_right = 0; + var->green.msb_right = 0; + var->red.msb_right = 0; +- var->transp.offset = 24; ++ var->transp.offset = 0; + var->transp.length = 8; + bpp = 4; + break; +@@ -1361,16 +1361,16 @@ static int msm_fb_register(struct msm_fb_data_type *mfd) + fix->xpanstep = 1; + fix->ypanstep = 1; + var->vmode = FB_VMODE_NONINTERLACED; +- var->blue.offset = 8; +- var->green.offset = 16; +- var->red.offset = 24; ++ var->blue.offset = 16; ++ var->green.offset = 8; ++ var->red.offset = 0; + var->blue.length = 8; + var->green.length = 8; + var->red.length = 8; + var->blue.msb_right = 0; + var->green.msb_right = 0; + var->red.msb_right = 0; +- var->transp.offset = 0; ++ var->transp.offset = 24; + var->transp.length = 8; + bpp = 4; + break; +@@ -2260,15 +2260,15 @@ static int msm_fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) + /* Figure out if the user meant RGBA or ARGB + and verify the position of the RGB components */ + +- if (var->transp.offset == 24) { +- if ((var->blue.offset != 0) || +- (var->green.offset != 8) || +- (var->red.offset != 16)) +- return -EINVAL; +- } else if (var->transp.offset == 0) { +- if ((var->blue.offset != 8) || ++ if (var->transp.offset == 0) { ++ if ((var->blue.offset != 24) || + (var->green.offset != 16) || +- (var->red.offset != 24)) ++ (var->red.offset != 8)) ++ return -EINVAL; ++ } else if (var->transp.offset == 24) { ++ if ((var->blue.offset != 16) || ++ (var->green.offset != 8) || ++ (var->red.offset != 0)) + return -EINVAL; + } else + return -EINVAL; +@@ -2365,7 +2365,7 @@ static int msm_fb_set_par(struct fb_info *info) + break; + + case 32: +- if (var->transp.offset == 24) ++ if (var->transp.offset == 0) + mfd->fb_imgType = MDP_ARGB_8888; + else + mfd->fb_imgType = MDP_RGBA_8888; +-- +2.14.1 + diff --git a/device/testing/linux-jolla-sbj/APKBUILD b/device/testing/linux-jolla-sbj/APKBUILD index a635d44bb..77252be64 100644 --- a/device/testing/linux-jolla-sbj/APKBUILD +++ b/device/testing/linux-jolla-sbj/APKBUILD @@ -1,13 +1,13 @@ # Kernel config based on: arch/arm/configs/msm8960_defconfig pkgname=linux-jolla-sbj -pkgver=3.4.0 -pkgrel=5 +pkgver=3.4.108 +pkgrel=0 pkgdesc="Jolla phone kernel fork" arch="armv7" _carch="arm" _flavor="jolla-sbj" -url="http://releases.sailfishos.org/sources/2.1.0.11/" +url="http://releases.sailfishos.org/sources/3.1.0.11/" license="GPL2" options="!strip !check !tracedeps pmb:cross-native" makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev gcc6" @@ -22,15 +22,16 @@ if [ "${CC:0:5}" != "gcc6-" ]; then fi # Source -_hash="2.1.0.11" +_hash="3.1.0.11" _config="config-$_flavor.$arch" source=" $pkgname-$_hash.tar.bz2::http://releases.sailfishos.org/sources/$_hash/sailfish-$_hash-oss-adaptation-sbj.tar.bz2 $_config + 01_fix-video-argb-setting.patch 02_gpu-msm-fix-gcc5-compile.patch duplicate-return-address-definition.patch " -_kver="kernel-adaptation-sbj-3.4.108.20161101.1" +_kver="kernel-adaptation-sbj-3.4.108.20190506.1" _kernelarchive="$srcdir/sailfish-$_hash-oss-adaptation-sbj/kernel-adaptation-sbj/$_kver.tar.bz2" builddir="$srcdir/$_kver" @@ -54,8 +55,9 @@ package() { } sha512sums=" -c0ff1641dd6ae4dbf736ddaf543da0cfd51188d36f163a5f519772867a44c19b40ab86043c9ee1598bbf766e05ef8620588dde9ae5ebadce6e03360ebc78e484 linux-jolla-sbj-2.1.0.11.tar.bz2 +b43353cb1f5c0205535153515eed0c10ca652fc1b2f28c12a40e8dbce08e304c49991e8c155800711fb0c07012c820a26fbf4c931b9b015994b67b1dc4615ef6 linux-jolla-sbj-3.1.0.11.tar.bz2 cd008aafd3ae04dbf3f010e893fa2d47169a2045d1706a2f28d5175011da96ca1280a2c73692bb14f2e7452327d2e83f9fdc251997a51c8df9c3f4ae5eb03b10 config-jolla-sbj.armv7 +e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd 01_fix-video-argb-setting.patch 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch 9b15bf1f6cb66f54c785b0af6c9db8a7d63257e6fa3eeb0cbf47284334166aa6a7ff93e1b64ab69206c8047d64641199c0f5fcbc257bbe039263252fff45118e duplicate-return-address-definition.patch "