diff --git a/device/device-motorola-ghost/APKBUILD b/device/device-motorola-ghost/APKBUILD index 80680b7ba..973ed59ca 100644 --- a/device/device-motorola-ghost/APKBUILD +++ b/device/device-motorola-ghost/APKBUILD @@ -2,12 +2,12 @@ pkgname="device-motorola-ghost" pkgdesc="Moto X (2013)" pkgver=0.1 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="noarch" options="!check" -depends="postmarketos-base linux-motorola-ghost mkbootimg mesa-dri-swrast" +depends="postmarketos-base linux-motorola-ghost mkbootimg mesa-dri-swrast msm-fb-refresher" makedepends="devicepkg-dev" source="deviceinfo" build() { @@ -18,4 +18,4 @@ package() { devicepkg_package $startdir $pkgname } -sha512sums="83662fbe0050eef207149f99afcc42cac4c0bf7e148e4519ee5a6c854eb69525baaff050a68213f076b9706c50a7d46a47235322addec93d21bfabd25caf60d9 deviceinfo" +sha512sums="6eb5dfbb89573701b99fd77e5a25ae72f1d5189787f1f6be18f14093cf203f074e17e8684e7f5419c03d5c3365af354e8857d4e323c6ecbd34bcad9e257b2f60 deviceinfo" diff --git a/device/device-motorola-ghost/deviceinfo b/device/device-motorola-ghost/deviceinfo index 60099e999..3cadcc7ae 100644 --- a/device/device-motorola-ghost/deviceinfo +++ b/device/device-motorola-ghost/deviceinfo @@ -14,7 +14,7 @@ deviceinfo_keyboard="false" deviceinfo_external_storage="false" deviceinfo_screen_width="720" deviceinfo_screen_height="1280" -deviceinfo_dev_touchscreen="" +deviceinfo_dev_touchscreen="/dev/input/event2" deviceinfo_dev_touchscreen_calibration="" deviceinfo_dev_keyboard="" diff --git a/device/linux-motorola-ghost/04_fix-video-argb-setting.patch b/device/linux-motorola-ghost/04_fix-video-argb-setting.patch new file mode 100644 index 000000000..a89148c21 --- /dev/null +++ b/device/linux-motorola-ghost/04_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/linux-motorola-ghost/APKBUILD b/device/linux-motorola-ghost/APKBUILD index 45b029ae8..39036afd6 100644 --- a/device/linux-motorola-ghost/APKBUILD +++ b/device/linux-motorola-ghost/APKBUILD @@ -2,7 +2,7 @@ pkgname="linux-motorola-ghost" pkgver=3.4.42 -pkgrel=0 +pkgrel=1 pkgdesc="Moto X (2013) kernel fork" arch="armhf" _carch="arm" @@ -26,6 +26,7 @@ source=" 01_gpu-msm-fix-gcc5-compile.patch 02_Input-lifebook-use-static-inline-instead-of-inline-i.patch 03_Input-sentelic-use-static-inline-instead-of-inline.patch + 04_fix-video-argb-setting.patch " builddir="$srcdir/${_repository}-${_commit}" @@ -66,4 +67,5 @@ d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104c ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 00_fix_return_address.patch 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 01_gpu-msm-fix-gcc5-compile.patch 5c49f6ff6773a7dc3067d2b1359648fe7a9f758b6c068d6fa69d9aaf24a291ba8022c960317d926aabc11d020a71b20c4e81a6fcf9b21ef66d9b6d065bae23e9 02_Input-lifebook-use-static-inline-instead-of-inline-i.patch -2d77d90b501aa8afbf81629e73fc0a2055b373942975f58277e43f398d0835b3dbbff4a1118137ec82873ba90a254fea87c1d73ba7708578f1779bd0b4c6ff2d 03_Input-sentelic-use-static-inline-instead-of-inline.patch" +2d77d90b501aa8afbf81629e73fc0a2055b373942975f58277e43f398d0835b3dbbff4a1118137ec82873ba90a254fea87c1d73ba7708578f1779bd0b4c6ff2d 03_Input-sentelic-use-static-inline-instead-of-inline.patch +e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd 04_fix-video-argb-setting.patch"