From da4afb710b69c152ee491f32b276a08d3a7f38bc Mon Sep 17 00:00:00 2001
From: frojnd <frojnd@frojnd.com>
Date: Tue, 23 Mar 2021 14:15:32 +0100
Subject: [PATCH] linux-motorola-falcon: fix fb format, upgrade to latest
 commit (MR 2058)

[ci:skip-build] Already built successfully on CI
---
 device/testing/linux-motorola-falcon/APKBUILD       | 10 ++++++----
 .../linux-motorola-falcon/fix_redish_display.patch  | 13 +++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 device/testing/linux-motorola-falcon/fix_redish_display.patch

diff --git a/device/testing/linux-motorola-falcon/APKBUILD b/device/testing/linux-motorola-falcon/APKBUILD
index 430d7892b..fadb9f049 100644
--- a/device/testing/linux-motorola-falcon/APKBUILD
+++ b/device/testing/linux-motorola-falcon/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=linux-motorola-falcon
 pkgver=3.4.113
-pkgrel=7
+pkgrel=8
 pkgdesc="Moto G (2013) kernel fork"
 arch="armv7"
 _carch="arm"
@@ -23,7 +23,7 @@ fi
 
 # Source
 _repository="android_kernel_motorola_msm8226"
-_commit="75e7c47f8084a89b3b3019641aea9f01166bfbcb"
+_commit="22bc4ed7f4149f95c84634e6c1baccbbd16c5cc5"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
@@ -32,6 +32,7 @@ source="
 	02_gpu-msm-fix-gcc5-compile.patch
 	03_mdss_fb_refresh_rate.patch
 	gcc10-extern_YYLOC_global_declaration.patch
+	fix_redish_display.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 
@@ -57,9 +58,10 @@ package() {
 		"$pkgdir/boot/dt.img"
 }
 
-sha512sums="8e651741fce8b6263647ae3f91bbd8ac6d36178ba1bd7c7dc31829e52596efc151ea344c43413a322b28ba96a8cc81def4b70e502940d50a92f66a1a18b263a9  linux-motorola-falcon-75e7c47f8084a89b3b3019641aea9f01166bfbcb.tar.gz
+sha512sums="5e55db19f198fadf0f914c2726c034eeaf9a1f4ad5823a7e8a4e9be2664eb0279c91fb2f1c6a9292be2ac523e367551475ff40569676775a03a709ae50a3d0ec  linux-motorola-falcon-22bc4ed7f4149f95c84634e6c1baccbbd16c5cc5.tar.gz
 d0a23e075db5fb49db5dd50ec2038c1e613b7d25a79aad94685449599e6a40c0ba36c2e298148baf2966950de0d8eeee1a6c3bb6eba14c334d6fe0d16be3f1b2  config-motorola-falcon.armv7
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
 83e52e5c5eb9721fe256c04f371197e9befeb129c6a0826c134000b96f8c1987f5634a6a207f1924bd2e833c7822866794742b91b1833d14998d80b5c1d5e646  03_mdss_fb_refresh_rate.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch"
+2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
+ebd2ff424c889775fce822da3dbdf580ff339bfd1a01739b19be9cb8f4edd176468e421d6bd3bbd6fefc302a2e656048d38fdc0760e6a2fb6bc072817a6d3a13  fix_redish_display.patch"
diff --git a/device/testing/linux-motorola-falcon/fix_redish_display.patch b/device/testing/linux-motorola-falcon/fix_redish_display.patch
new file mode 100644
index 000000000..aacf34638
--- /dev/null
+++ b/device/testing/linux-motorola-falcon/fix_redish_display.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
+index 53112ca6..69673017 100644
+--- a/drivers/video/msm/mdss/mdss_fb.c
++++ b/drivers/video/msm/mdss/mdss_fb.c
+@@ -569,7 +569,7 @@ static int mdss_fb_probe(struct platform_device *pdev)
+ 	mfd->bl_level = 0;
+ 	mfd->bl_scale = 1024;
+	mfd->bl_min_lvl = 30;
+-	mfd->fb_imgType = MDP_RGBA_8888;
++	mfd->fb_imgType = MDP_RGB_888;
+ 
+ 	mfd->pdev = pdev;
+ 	if (pdata->next)