From 9f7c7752c1e018bb67710a2791faae1f225e30ed Mon Sep 17 00:00:00 2001
From: Nick Boone <fooforever@gmail.com>
Date: Thu, 2 Jul 2020 00:41:04 +0100
Subject: [PATCH] htc-m8: fix red screen issue (MR 1384)

---
 .../0001-fix-video-argb-setting.patch         | 79 +++++++++++++++++++
 device/testing/linux-htc-m8/APKBUILD          |  4 +-
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 device/testing/linux-htc-m8/0001-fix-video-argb-setting.patch

diff --git a/device/testing/linux-htc-m8/0001-fix-video-argb-setting.patch b/device/testing/linux-htc-m8/0001-fix-video-argb-setting.patch
new file mode 100644
index 000000000..fd506db01
--- /dev/null
+++ b/device/testing/linux-htc-m8/0001-fix-video-argb-setting.patch
@@ -0,0 +1,79 @@
+diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
+index 1f18d736..7e79aefc 100644
+--- a/drivers/video/msm/mdss/mdss_fb.c
++++ b/drivers/video/msm/mdss/mdss_fb.c
+@@ -1629,16 +1629,16 @@ static int mdss_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;
+@@ -1648,16 +1648,16 @@ static int mdss_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;
+@@ -2483,15 +2483,15 @@ static int mdss_fb_check_var(struct fb_var_screeninfo *var,
+ 		/* 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;
+@@ -2581,7 +2581,7 @@ static int mdss_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;
diff --git a/device/testing/linux-htc-m8/APKBUILD b/device/testing/linux-htc-m8/APKBUILD
index 9449dac87..62ac0b34b 100644
--- a/device/testing/linux-htc-m8/APKBUILD
+++ b/device/testing/linux-htc-m8/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=linux-htc-m8
 pkgver=3.4.113
-pkgrel=2
+pkgrel=3
 pkgdesc="HTC One M8 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -29,6 +29,7 @@ source="
 	$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
 	$_config
 	compiler-gcc6.h
+	0001-fix-video-argb-setting.patch
 	02_gpu-msm-fix-gcc5-compile.patch
 	psmouse_base.patch
 "
@@ -59,5 +60,6 @@ package() {
 sha512sums="3f826c698af5839fd83e9204d8d4c28db35a0e8c174c0cef005acea5fa53b2463fb0d984f2d1c99e8608ecd9698fb59e954f2e7218688f75a97fee735b7b9856  linux-htc-m8-1e7a57485c90cb838cffe022831e6bec4a599548.tar.gz
 e64aee85e627e943fa8acbf9c9600615a6c5bb97098aa7113c57fdbee60c966f064416946e97bc9ea1013a00b9771236c8a7452436144bb4566a9ba62e9fbfbf  config-htc-m8.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
+35cdbf82daef7a421a92ee3b95cc57d1c77ac62d3957bb2ea60021817381348a7c9dd4119becaae2faa8ace7e21fb40d417b9ca1c0affc46947ea52625bd9127  0001-fix-video-argb-setting.patch
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
 f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc213874e358a6ff367418556a4542fba7e3c17e4b8e82e05c3a543  psmouse_base.patch"