From 1b585e3317990fd107cfe14c413f93faacaf7e49 Mon Sep 17 00:00:00 2001 From: Anton Bambura Date: Mon, 19 Feb 2024 20:00:04 +0200 Subject: [PATCH] google-snow: enable GPU (MR 4843) Enable GPU by removing all software rendering workarounds. While at it also remove i3wm config, because it should be in ui package if we want to make it default. See https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/61093 --- device/community/device-google-snow/APKBUILD | 44 ++----------------- .../community/device-google-snow/deviceinfo | 2 - .../i3wm/xorg.conf.d/90-tap-to-click.conf | 6 --- .../device-google-snow/modprobe.d/mali.conf | 1 - .../device-google-snow/mpv/mpv.conf.wayland | 3 -- .../device-google-snow/mpv/mpv.conf.xorg | 3 -- .../sway/tinydm/10-no-hardware-cursor.sh | 5 --- 7 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 device/community/device-google-snow/i3wm/xorg.conf.d/90-tap-to-click.conf delete mode 100644 device/community/device-google-snow/modprobe.d/mali.conf delete mode 100644 device/community/device-google-snow/mpv/mpv.conf.wayland delete mode 100644 device/community/device-google-snow/mpv/mpv.conf.xorg delete mode 100644 device/community/device-google-snow/sway/tinydm/10-no-hardware-cursor.sh diff --git a/device/community/device-google-snow/APKBUILD b/device/community/device-google-snow/APKBUILD index e6221fb2e..ac2d42ef7 100644 --- a/device/community/device-google-snow/APKBUILD +++ b/device/community/device-google-snow/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jenneron pkgname=device-google-snow pkgdesc="Samsung Chromebook" -pkgver=4 -pkgrel=4 +pkgver=5 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -20,19 +20,11 @@ makedepends="devicepkg-dev" source=" deviceinfo modules-initfs - i3wm/xorg.conf.d/90-tap-to-click.conf - modprobe.d/mali.conf ucm/HiFi.conf ucm/Snow-I2S-MAX98090.conf - mpv/mpv.conf.wayland - mpv/mpv.conf.xorg sway/foot/foot.ini - sway/tinydm/10-no-hardware-cursor.sh " subpackages=" - $pkgname-i3wm - $pkgname-mpv-wayland:mpv_wayland - $pkgname-mpv-xorg:mpv_xorg $pkgname-nonfree-firmware:nonfree_firmware $pkgname-sway " @@ -44,10 +36,6 @@ build() { package() { devicepkg_package $startdir $pkgname - # Block panfrost probe as it causes segfault in X11 - install -Dm644 "$srcdir"/mali.conf \ - "$pkgdir"/etc/modprobe.d/mali.conf - # Alsa UCM configs install -Dm644 "$srcdir"/Snow-I2S-MAX98090.conf \ "$pkgdir"/usr/share/alsa/ucm2/conf.d/Snow-I2S-MAX980/Snow-I2S-MAX98090.conf @@ -55,25 +43,6 @@ package() { "$pkgdir"/usr/share/alsa/ucm2/conf.d/Snow-I2S-MAX980/HiFi.conf } -i3wm() { - install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm" - install -D -m644 "$srcdir"/90-tap-to-click.conf \ - "$subpkgdir"/etc/X11/xorg.conf.d/90-tap-to-click.conf -} - -mpv_wayland() { - # Looks like wayland libs are installed with some x11 UIs too, so match wlroots here - install_if="$pkgname=$pkgver-r$pkgrel mpv wlroots" - install -Dm644 "$srcdir"/mpv.conf.wayland \ - "$subpkgdir"/etc/mpv/mpv.conf -} - -mpv_xorg() { - install_if="$pkgname=$pkgver-r$pkgrel mpv xorg-server" - install -Dm644 "$srcdir"/mpv.conf.xorg \ - "$subpkgdir"/etc/mpv/mpv.conf -} - nonfree_firmware() { pkgdesc="WiFi/BT and MFC firmware" depends="linux-firmware-mrvl linux-firmware-s5p-mfc" @@ -84,19 +53,12 @@ sway() { install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway" install -Dm644 "$srcdir"/foot.ini \ "$subpkgdir"/etc/skel/.config/foot/foot.ini - install -Dm755 "$srcdir"/10-no-hardware-cursor.sh \ - "$subpkgdir"/etc/tinydm.d/env-wayland.d/10-no-hardware-cursor.sh } sha512sums=" -4be0a2e0ff5d5189b9adbea995b111724cf686eda3c191fac405757facee4621297314bb4d2015e8dc72b29f30d47d2e00253d70d64c51a02a5177cb4d4959cd deviceinfo +8f12e32794f68ecc312ef9edde380bffc73f931cf210c8e0a5552f47b325f0f6648a95986ae17ad0a32245308dfd3c1e381377b67e6b96eeae18f97b83621f92 deviceinfo a1fd6b4964b0bd4c66983430528f5906eea5cc9ddbe8485ba17e97496652240d0a93dbd3af34ecd3c273b7172202b8dcb24e0b5fa372512d01affec3914a023d modules-initfs -e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da 90-tap-to-click.conf -c5fdd5a39a41044343d937a1ad31cc6bb893f19a329beb4ce09249064cac066d643c84ffcbfcd794113c228c5a56e28c82812092751546b49ab31142dc8245b1 mali.conf 8a8f593694528a9323ef4a0aff7e9c6ad45608957eb042d425663f682885c2f95eb01db4fe87b7c43a90de48f3e5f8b10cab4b13c547b5b0d31b924fcb083cad HiFi.conf b163535da7626e3866faa45768c3888f69f90c98d694650e16a7594a03eb91391e166931eb487901217d983bb2dc4e49b99a2a5531740a7d87f8f4f5c3d0cf59 Snow-I2S-MAX98090.conf -8f9dc3c7caeab6c5321dc2bf498f1a03a793f23cb776763316bc356b9d433d7a3337e61154069464dcda200bf390b99f3be8f657a40c6d2f6be3cbc6fb751080 mpv.conf.wayland -d6bc39df48ba0e985a796426039205335adf1c91b9c150b05a4239339fc78b1748b3a83c699de69e9a5829f29573a323f40788da58ed15b1951de1eab7e31c3d mpv.conf.xorg 61c56cf84cf88371a2238845db1f8283c7eb7b417dec8c51d71e51fb96899bb026c0ee22dc94a43537a56477fb0db59de960949add4b0ce90552a1286e6afe69 foot.ini -8ddd237b14e8eea34b8716d155cdf199cf681b1287b482c8e184656d6d0440f018a2d46478c8b45eb790a1e71cfcfefd0f66798cd0b226647f11088549cfae64 10-no-hardware-cursor.sh " diff --git a/device/community/device-google-snow/deviceinfo b/device/community/device-google-snow/deviceinfo index 79d8532a0..7a61a62d3 100644 --- a/device/community/device-google-snow/deviceinfo +++ b/device/community/device-google-snow/deviceinfo @@ -16,8 +16,6 @@ deviceinfo_keyboard="true" deviceinfo_external_storage="true" deviceinfo_screen_width="1366" deviceinfo_screen_height="768" - -# DRM is available, so all UIs can work with software rendering deviceinfo_gpu_accelerated="true" # Bootloader related diff --git a/device/community/device-google-snow/i3wm/xorg.conf.d/90-tap-to-click.conf b/device/community/device-google-snow/i3wm/xorg.conf.d/90-tap-to-click.conf deleted file mode 100644 index b068f5c5d..000000000 --- a/device/community/device-google-snow/i3wm/xorg.conf.d/90-tap-to-click.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "touchpad" - MatchIsTouchpad "on" - Driver "libinput" - Option "Tapping" "on" -EndSection diff --git a/device/community/device-google-snow/modprobe.d/mali.conf b/device/community/device-google-snow/modprobe.d/mali.conf deleted file mode 100644 index c12c7fa01..000000000 --- a/device/community/device-google-snow/modprobe.d/mali.conf +++ /dev/null @@ -1 +0,0 @@ -blacklist panfrost diff --git a/device/community/device-google-snow/mpv/mpv.conf.wayland b/device/community/device-google-snow/mpv/mpv.conf.wayland deleted file mode 100644 index 554066f60..000000000 --- a/device/community/device-google-snow/mpv/mpv.conf.wayland +++ /dev/null @@ -1,3 +0,0 @@ -vo=wlshm -profile=sw-fast -ytdl-format="bestvideo[height<=?720]+bestaudio/best" diff --git a/device/community/device-google-snow/mpv/mpv.conf.xorg b/device/community/device-google-snow/mpv/mpv.conf.xorg deleted file mode 100644 index 3a7296eae..000000000 --- a/device/community/device-google-snow/mpv/mpv.conf.xorg +++ /dev/null @@ -1,3 +0,0 @@ -vo=x11 -profile=sw-fast -ytdl-format="bestvideo[height<=?720]+bestaudio/best" diff --git a/device/community/device-google-snow/sway/tinydm/10-no-hardware-cursor.sh b/device/community/device-google-snow/sway/tinydm/10-no-hardware-cursor.sh deleted file mode 100644 index 637bce3da..000000000 --- a/device/community/device-google-snow/sway/tinydm/10-no-hardware-cursor.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# A workaround for missing cursor issue - -export WLR_NO_HARDWARE_CURSORS=1