From 624c965b413205791ddcfa8a589c3f3afee5859b Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Sun, 30 Jun 2019 12:10:38 +0200
Subject: [PATCH] lg-hammerhead: mesa-freedreno, serial tty0, fix X (!450)

Use the new mesa-freedreno package. Configure inittab to start a
terminal on ttyMSM0 (serial). Remove fbdev from xorg.conf and set
SWCursor on.

Based on patches from Brian Masney.
---
 device/device-lg-hammerhead/APKBUILD                      | 8 ++++----
 .../device-lg-hammerhead.post-install                     | 2 ++
 device/device-lg-hammerhead/deviceinfo                    | 2 +-
 device/device-lg-hammerhead/xorg.conf                     | 4 +---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/device/device-lg-hammerhead/APKBUILD b/device/device-lg-hammerhead/APKBUILD
index 6714c0681..64bf072de 100644
--- a/device/device-lg-hammerhead/APKBUILD
+++ b/device/device-lg-hammerhead/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-hammerhead
 pkgver=2
-pkgrel=4
+pkgrel=5
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-postmarketos-qcom mkbootimg mesa-dri-freedreno ofono"
+depends="postmarketos-base linux-postmarketos-qcom mkbootimg mesa-freedreno mesa-freedreno-dri-freedreno ofono"
 makedepends=""
 install="$pkgname.post-install"
 subpackages="$pkgname-weston $pkgname-x11 $pkgname-nonfree-firmware:nonfree_firmware"
@@ -49,8 +49,8 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="cf2898ebffaa7d67bfde0fd29849bc635f979def1bfaa1efe0cb2e5bb50d3721574ab2a0211c0740b00e4ff92ca22b85b93cfa7a8a831da6048f44a1ee7d9e88  deviceinfo
+sha512sums="e3ce75139e862193e45d5e17f2e3d4250eb13efaa3e615a6b240f095772b6dc7a5cd49b1e4e176189cae7a2e7145315f0ebb94ee67d3e5bb6b7528090abb1b88  deviceinfo
 4c22070223f39c419260a6817e5cc2b7881c095deeba031363a5634842dd175dd67eecace980849f0553de79110ef4e43a66143d71433805cd916c37fe7248e9  weston.ini
-f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369  xorg.conf
+2c9277ca97b27780a6a38120953bd3c9b3a66c05940241bb8d373bed9b1ea5c89bfbf1b3fa6b78826de42085564dbade14cdc8eb5651e4a511ce3b5942d2f03d  xorg.conf
 d8ce60ea7acaabf627ddca2f0887a4cda46f313b7aaf7934bef2fef8a6e0798ccefab849e4571e4e3fcd06ae34c1a6efe3b58b401e2e443416f6200e6d4ea769  modules-load.conf
 59baf815a45c632f3413dc8d9f48978f91d8f8ee165003689dcd54cc3b3d1af65bfc0c88f76579f840b83b303a28a1de2c2994a651d62cc6f6d8988c8716e345  brcmfmac4339-sdio.txt"
diff --git a/device/device-lg-hammerhead/device-lg-hammerhead.post-install b/device/device-lg-hammerhead/device-lg-hammerhead.post-install
index f3cc5122e..686241486 100644
--- a/device/device-lg-hammerhead/device-lg-hammerhead.post-install
+++ b/device/device-lg-hammerhead/device-lg-hammerhead.post-install
@@ -1,4 +1,6 @@
 #!/bin/sh
 
+echo "ttyMSM0::respawn:/sbin/getty -L ttyMSM0 115200 vt100" >> /etc/inittab
+
 # Enable ofono
 rc-update add ofono default
diff --git a/device/device-lg-hammerhead/deviceinfo b/device/device-lg-hammerhead/deviceinfo
index 585b0f3c2..4ffd138ee 100644
--- a/device/device-lg-hammerhead/deviceinfo
+++ b/device/device-lg-hammerhead/deviceinfo
@@ -26,6 +26,6 @@ deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x2900000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x02700000"
-deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8"
+deviceinfo_kernel_cmdline="console=tty0 console=ttyMSM0,115200,n8 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_flash_pagesize="2048"
 
diff --git a/device/device-lg-hammerhead/xorg.conf b/device/device-lg-hammerhead/xorg.conf
index b7374dc41..8f8b5f9aa 100644
--- a/device/device-lg-hammerhead/xorg.conf
+++ b/device/device-lg-hammerhead/xorg.conf
@@ -5,8 +5,7 @@ EndSection
 
 Section "Device"
   Identifier "Card0"
-  Driver "fbdev"
-  Option "fbdev" "/dev/fb0" #linuxdeploy
+  Option "SWCursor" "on"
 EndSection
 
 Section "Screen"
@@ -21,4 +20,3 @@ EndSection
 Section "ServerFlags"
   Option "Pixmap" "24"
 EndSection
-