From 6374a1aaba94e86cd21d4d7181ee76c50e1bd992 Mon Sep 17 00:00:00 2001
From: Mighty <mightymb17@gmail.com>
Date: Thu, 6 Jan 2022 13:40:01 +0530
Subject: [PATCH] samsung-espresso3g: Fix Xorg (with our kernel) (MR 2822)

---
 device/community/device-samsung-espresso3g/APKBUILD | 13 ++++++++++---
 .../community/device-samsung-espresso3g/xorg.conf   | 12 ++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 device/community/device-samsung-espresso3g/xorg.conf

diff --git a/device/community/device-samsung-espresso3g/APKBUILD b/device/community/device-samsung-espresso3g/APKBUILD
index 07a7ddfb1..e0e3617a7 100644
--- a/device/community/device-samsung-espresso3g/APKBUILD
+++ b/device/community/device-samsung-espresso3g/APKBUILD
@@ -3,15 +3,15 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-espresso3g
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
-pkgver=0.2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base postmarketos-update-kernel linux-samsung-espresso3g mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo"
+source="deviceinfo xorg.conf"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-nonfree-userland:nonfree_userland"
 
 build() {
@@ -43,6 +43,13 @@ phosh() {
 			"$subpkgdir"/usr/share/phosh/phoc.ini
 }
 
+x11() {
+	install_if="$pkgname xorg-server"
+	install -Dm644 "$srcdir"/xorg.conf \
+		"$subpkgdir"/etc/X11/xorg.conf.d/99-modesetting.conf
+}
+
 sha512sums="
 41897ea67a1773023269a37aab57dc6a60e6804319ae329ce355cac464809c16699262dca1f4b1895b01e9e20bfc640ce3577ac0703a33ba2201555e4d0f28f9  deviceinfo
+41f0d61da6f5029be51396fdcdc91aa241c47825adc32cc03f81d1c2ada633f1e293a03dd3ed75a7e8c3e2d960aec889ecdb3af7db5f106444c06f4f6c45debd  xorg.conf
 "
diff --git a/device/community/device-samsung-espresso3g/xorg.conf b/device/community/device-samsung-espresso3g/xorg.conf
new file mode 100644
index 000000000..350823c43
--- /dev/null
+++ b/device/community/device-samsung-espresso3g/xorg.conf
@@ -0,0 +1,12 @@
+Section "Device"
+  Identifier "DSI-1"
+  Driver "modesetting"
+  Option "kmsdev" "/dev/dri/by-path/platform-omapdrm.0-card"
+  Option "AccelMethod" "none"
+  Option "Atomic" "on"
+  Option "VariableRefresh" "on"
+EndSection
+
+Section "ServerFlags"
+  Option "AutoAddGPU" "false"
+EndSection