From e100b18aca480ed00d7d629a586a4edebfd1fa31 Mon Sep 17 00:00:00 2001
From: Eric Hosmer <EricJ2190@users.noreply.github.com>
Date: Fri, 12 Jan 2018 17:01:55 -0500
Subject: [PATCH] motorola-shamu: Fix black screen after splash (#1112)

---
 device/device-motorola-shamu/APKBUILD                   | 8 ++++----
 device/device-motorola-shamu/deviceinfo                 | 2 +-
 device/device-motorola-shamu/initfs-hook.sh             | 5 +++++
 device/linux-motorola-shamu/APKBUILD                    | 4 ++--
 device/linux-motorola-shamu/config-motorola-shamu.armhf | 5 ++++-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/device/device-motorola-shamu/APKBUILD b/device/device-motorola-shamu/APKBUILD
index dcfb90b6c..59be6e389 100644
--- a/device/device-motorola-shamu/APKBUILD
+++ b/device/device-motorola-shamu/APKBUILD
@@ -1,13 +1,13 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname="device-motorola-shamu"
 pkgdesc="Motorola Google Nexus 6"
-pkgver=0.2
+pkgver=0.3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-motorola-shamu mkbootimg mesa-dri-swrast"
+depends="linux-motorola-shamu mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo initfs-hook.sh"
 
@@ -21,5 +21,5 @@ package() {
 		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh
 }
 
-sha512sums="13c79ab6154aaea987a6214d0cc22bd940c111ef4759064ef1abb32b5148b1e07932ab011441f7e97ce39d9bc84a21a5064c2e0940d7818f7d5085d768445057  deviceinfo
-61ca4daae82a27775463d95d7857324ea542bec47dc1f9b0106d1dadd3d9da66bba5a5c9a4e28a8330fd117a49432ea063ef4a0e27e9c6b0826d3abcf11f7e44  initfs-hook.sh"
+sha512sums="7f87b50f7123f8b45a79c4c27ac96615aaea7ac21be1350d306ffb2ed8fcf0ff7de80db76fa03d79e3f7673e2295f43e047aab2be20720f827f439217b80e8f1  deviceinfo
+c4f4785a9fea1d8b461e1de4dcd04daae45bd9df94f8123655b981de5ac5718f082a59169c39c506aa996c1642f465249fbc8b6e1c0463aeca6abf74ff523d9c  initfs-hook.sh"
diff --git a/device/device-motorola-shamu/deviceinfo b/device/device-motorola-shamu/deviceinfo
index 320316be8..7786ba387 100644
--- a/device/device-motorola-shamu/deviceinfo
+++ b/device/device-motorola-shamu/deviceinfo
@@ -18,7 +18,7 @@ deviceinfo_screen_height="2560"
 deviceinfo_dev_touchscreen="/dev/input/event0"
 deviceinfo_dev_touchscreen_calibration=""
 deviceinfo_dev_keyboard=""
-deviceinfo_msm_refresher="false"
+deviceinfo_msm_refresher="true"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
diff --git a/device/device-motorola-shamu/initfs-hook.sh b/device/device-motorola-shamu/initfs-hook.sh
index 9cb6d08a7..c4e740906 100644
--- a/device/device-motorola-shamu/initfs-hook.sh
+++ b/device/device-motorola-shamu/initfs-hook.sh
@@ -2,3 +2,8 @@
 
 # enable touchscreen
 echo 1 > /sys/devices/f9966000.i2c/i2c-1/1-004a/drv_irq
+
+# write to screen brightness to fix black screen after splash
+cat /sys/devices/fd900000.qcom,mdss_mdp/qcom,mdss_fb_primary.164/leds/lcd-backlight/brightness > \
+	/sys/devices/fd900000.qcom,mdss_mdp/qcom,mdss_fb_primary.164/leds/lcd-backlight/brightness
+
diff --git a/device/linux-motorola-shamu/APKBUILD b/device/linux-motorola-shamu/APKBUILD
index 05caaace8..2fef9e2b8 100644
--- a/device/linux-motorola-shamu/APKBUILD
+++ b/device/linux-motorola-shamu/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-motorola-shamu"
 pkgver=3.10.40
-pkgrel=0
+pkgrel=1
 pkgdesc="Motorola Google Nexus 6 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -76,6 +76,6 @@ package() {
 }
 
 sha512sums="2349f1ea66d3bf05675d91a8cf959bf683818c4aafc04b3ec60f8d0ee07dae1d38ade24b14a2457df733ed2db8249dba680a70992d5748806375b76b9cc47dc5  linux-motorola-shamu-0f791f84d1951e144f1e466ba97dd692d33d93c7.tar.gz
-f213d6de389fc8765460696c62b5e8d9d380b67bb740a60c09f55862e02cacdc66f666320348630b219c340974c1ce6a5f319af6f909cf624420e4c796fb4715  config-motorola-shamu.armhf
+ffba29331b793b05831bd7cf4d5ddae0cb9ca6c8aae6ecf6c8826f8aa1aa62ced03a0559afe3efa6c838ecc0f0cb9ea05a3583bcef3e9e32ce2bcc42497171e6  config-motorola-shamu.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch"
diff --git a/device/linux-motorola-shamu/config-motorola-shamu.armhf b/device/linux-motorola-shamu/config-motorola-shamu.armhf
index 56a8bd26c..2cae74aae 100644
--- a/device/linux-motorola-shamu/config-motorola-shamu.armhf
+++ b/device/linux-motorola-shamu/config-motorola-shamu.armhf
@@ -2410,7 +2410,9 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 #
 # CONFIG_VGA_ARB is not set
 # CONFIG_DRM is not set
-# CONFIG_MSM_KGSL is not set
+CONFIG_MSM_KGSL=y
+# CONFIG_MSM_KGSL_CFF_DUMP is not set
+CONFIG_MSM_ADRENO_DEFAULT_GOVERNOR="msm-adreno-tz"
 CONFIG_KGSL_PER_PROCESS_PAGE_TABLE=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -3279,6 +3281,7 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_MSM_ADRENO_TZ=y
 CONFIG_DEVFREQ_GOV_MSM_CPUFREQ=y
 CONFIG_DEVFREQ_GOV_MSM_BW_HWMON=y
 CONFIG_DEVFREQ_GOV_MSM_CACHE_HWMON=y