diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt new file mode 100644 index 0000000000..84440c213d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt @@ -0,0 +1,36 @@ +package com.droiddeck.launcher.gpu + +import android.util.Log + +object TpUbwcHint { + const val ENV = "FD_DEV_FEATURES" + private const val TAG = "TpUbwcHint" + + @Volatile private var resolved = false + @Volatile private var cached: String? = null + + // On Adreno 740, TPL1_DBG_ECO_CNTL1.TP_UBWC_FLAG_HINT is shared by every driver on the GPU and must + // match the system driver: blob v6xx leaves it off, newer blobs set it. A mismatch corrupts Android UI. + internal fun features(model: Int, systemDriverVersion: String?): String? { + if (model != 740) return null + val blob = systemDriverVersion?.split('.')?.getOrNull(1)?.toIntOrNull() ?: return null + return "enable_tp_ubwc_flag_hint=" + if (blob >= 700) "1" else "0" + } + + @Synchronized + fun forThisDevice(): String? { + if (resolved) return cached + val model = GpuInfo.detect().model + val version = if (model == 740) VulkanInfo.query()["driver_version"] else null + cached = features(model, version) + resolved = true + Log.i(TAG, "Adreno $model, system driver ${version ?: "n/a"}: ${cached ?: "driver default"}") + return cached + } + + fun applyToProcess() { + val value = forThisDevice() ?: return + runCatching { android.system.Os.setenv(ENV, value, true) } + .onFailure { Log.w(TAG, "setenv $ENV failed: ${it.javaClass.simpleName}") } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 8d5885510d..4bd8cebc61 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -292,6 +292,7 @@ class SessionService : Service() { private fun runSession(gen: Int) { SessionTerminal.clear() + com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice() try { LinuxRuntime.writeAccounts(this) } catch (e: Exception) { @@ -540,6 +541,7 @@ class SessionService : Service() { LinuxVulkanDriver.resolveIcdPath(this, linuxDriverId) ?.let { guest.add(LinuxVulkanDriver.ENV + "=" + it) } tuDebug(linuxDriverId)?.let { guest.add("TU_DEBUG=$it") } + com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice()?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } if (SessionPrefs.zinkLazy(this)) { guest.add("ZINK_DESCRIPTORS=lazy") guest.add("ZINK_DEBUG=compact") diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt index efb1fbdd73..1f0b283caf 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -38,6 +38,7 @@ object CompositorHost { return false } WaylandCompositor.nativeSetOutputRefreshRate(refreshHz) + com.droiddeck.launcher.gpu.TpUbwcHint.applyToProcess() WaylandCompositor.nativeStartWithSurface( surface, xdgRuntimeDir, driverPath, libraryName, nativeLibDir, ) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt new file mode 100644 index 0000000000..ab037e1525 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt @@ -0,0 +1,25 @@ +package com.droiddeck.launcher.gpu + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class TpUbwcHintTest { + @Test fun a740OnABlobV6xxTurnsTheHintOff() { + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.676.53")) + } + + @Test fun a740OnANewerBlobTurnsTheHintOn() { + assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, "512.762.10")) + } + + @Test fun otherGpusKeepTheirDriverDefault() { + assertNull(TpUbwcHint.features(750, "512.762.10")) + assertNull(TpUbwcHint.features(830, "512.676.53")) + } + + @Test fun anUnreadableSystemDriverKeepsTheDriverDefault() { + assertNull(TpUbwcHint.features(740, null)) + assertNull(TpUbwcHint.features(740, "garbage")) + } +}