From fc768a3c4517ba266a0234132751c89685097786 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 23 Oct 2026 10:55:46 -0400 Subject: [PATCH] feat: add an A740 UBWC compatibility override --- .../com/droiddeck/launcher/DriverMenus.kt | 14 +++++ .../droiddeck/launcher/FrontEndActivity.kt | 1 + .../com/droiddeck/launcher/SessionActivity.kt | 2 +- .../droiddeck/launcher/core/DeviceReport.kt | 7 ++- .../com/droiddeck/launcher/gpu/TpUbwcHint.kt | 23 ++++++--- .../launcher/session/SessionPrefs.kt | 13 +++++ .../launcher/session/SessionService.kt | 4 +- .../droiddeck/launcher/ui/GpuDriversPanel.kt | 25 +++++++++ .../launcher/wayland/CompositorHost.kt | 3 +- app/src/main/res/values/strings.xml | 3 ++ .../droiddeck/launcher/DriverMenusAutoTest.kt | 14 +++++ .../droiddeck/launcher/gpu/TpUbwcHintTest.kt | 19 +++++++ .../launcher/session/TpUbwcPrefsTest.kt | 51 +++++++++++++++++++ 13 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 7ccbba7f55..a630cc184f 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -55,6 +55,9 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl private set private var runtimePending by mutableStateOf(false) private var sessionRunning by mutableStateOf(false) + private var initialTpUbwcMode: String? = null + var tpUbwcMode: String by mutableStateOf(SessionPrefs.TP_UBWC_AUTO) + private set val uiMode: String get() = when (mode) { SessionPrefs.GPU_DRIVERS_AUTO -> GPU_MODE_AUTO @@ -73,8 +76,17 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl mode = uiMode, display = displaySlot(), runtime = runtimeSlot(), canRestart = !sessionRunning, checkedAt = TurnipReleases.cached(activity)?.checkedAt ?: 0L, + tpUbwcMode = tpUbwcMode.takeIf { gpu.model == 740 }, + tpUbwcRestartRequired = (initialTpUbwcMode != null && tpUbwcMode != initialTpUbwcMode) || + com.droiddeck.launcher.gpu.TpUbwcHint.restartRequired(activity), ) + fun chooseTpUbwcMode(mode: String) { + if (gpu.model != 740) return + SessionPrefs.setTpUbwcMode(activity, mode) + tpUbwcMode = mode + } + private fun slotSource(chosenDefault: Boolean, defaultLabel: Int): String = activity.getString(when { uiMode == GPU_MODE_AUTO -> R.string.gpu_src_auto uiMode == GPU_MODE_PAIR && pairRows.any { it.active } -> R.string.gpu_src_pair @@ -124,6 +136,8 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl var androidSelected by mutableStateOf("") fun refreshDrivers() { + tpUbwcMode = SessionPrefs.tpUbwcMode(activity) + if (initialTpUbwcMode == null) initialTpUbwcMode = tpUbwcMode val lm = LinuxVulkanDriverManager(activity) fun origin(id: String) = if (TurnipReleases.isDownloaded(activity, id)) DriverRow.DOWNLOADED else DriverRow.IMPORTED val bundles = DriverBundle.all(activity) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 1a06392013..52aed25cbc 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1511,6 +1511,7 @@ class FrontEndActivity : ComponentActivity() { onRestoreBundled = { TurnipDriver(this).restoreBundled(); drivers.refreshDrivers() }, onMode = { m -> drivers.chooseMode(m) }, onRestart = { drivers.restartApp() }, + onTpUbwcMode = { drivers.chooseTpUbwcMode(it) }, ), protons = com.droiddeck.launcher.ui.ProtonsState( rows = protons.protonRows, busyId = protons.protonBusyId, stage = protons.protonStage, percent = protons.protonPercent, diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index b4fd3fd4b6..4f159908bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1706,7 +1706,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } com.droiddeck.launcher.gpu.DriverSetupLog.write(this, "compositor.start driver=$driverId") CompositorHost.startOrAttach( - holder.surface, runtimeDir.path, + this, holder.surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(), outputFpsLimit(), ) diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index 903851a5a9..1e59fb577e 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -200,7 +200,12 @@ object DeviceReport { h("Drivers") val gpu = com.droiddeck.launcher.gpu.GpuInfo.detect() k("GPU", "${gpu.name} · ${gpu.family.label} · ${gpu.supportText}" + if (gpu.oneUi8Gen2) " · One UI 8 Gen 2" else "") - if (gpu.model == 740) k("TP UBWC hint", com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice() ?: "driver default") + if (gpu.model == 740) { + val hint = com.droiddeck.launcher.gpu.TpUbwcHint + k("TP UBWC hint", hint.forThisDevice(context) ?: "driver default") + k("TP UBWC mode", hint.activeMode ?: SessionPrefs.TP_UBWC_AUTO) + if (hint.restartRequired(context)) k("TP UBWC pending", "${SessionPrefs.tpUbwcMode(context)} (restart required)") + } k("Driver mode", SessionPrefs.gpuDriverMode(context) + (com.droiddeck.launcher.gpu.DriverPairs.recommendedKey(gpu, com.droiddeck.launcher.gpu.DriverPairs.from( com.droiddeck.launcher.gpu.TurnipReleases.cached(context)), com.droiddeck.launcher.gpu.TurnipReleases.autoPicks(context), diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt index 1ccee78e24..40ca3fb7fc 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.gpu +import android.content.Context import android.util.Log +import com.droiddeck.launcher.session.SessionPrefs object TpUbwcHint { const val ENV = "FD_DEV_FEATURES" @@ -8,31 +10,40 @@ object TpUbwcHint { @Volatile private var resolved = false @Volatile private var cached: String? = null + @Volatile var activeMode: String? = null + private set // 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. // Samsung's One UI firmware sets it whatever blob version it reports. - internal fun features(model: Int, systemDriverVersion: String?, samsung: Boolean = false): String? { + internal fun features(model: Int, systemDriverVersion: String?, samsung: Boolean = false, + mode: String = SessionPrefs.TP_UBWC_AUTO): String? { if (model != 740) return null + if (mode == SessionPrefs.TP_UBWC_ON) return "enable_tp_ubwc_flag_hint=1" + if (mode == SessionPrefs.TP_UBWC_OFF) return "enable_tp_ubwc_flag_hint=0" if (samsung) return "enable_tp_ubwc_flag_hint=1" 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? { + fun forThisDevice(context: Context): String? { if (resolved) return cached + val mode = SessionPrefs.tpUbwcMode(context) val gpu = GpuInfo.detect() val model = gpu.model val version = if (model == 740) VulkanInfo.query()["driver_version"] else null - cached = features(model, version, gpu.oneUi8Gen2) + cached = features(model, version, gpu.oneUi8Gen2, mode) + activeMode = mode resolved = true - Log.i(TAG, "Adreno $model${if (gpu.oneUi8Gen2) " (One UI)" else ""}, system driver ${version ?: "n/a"}: ${cached ?: "driver default"}") + Log.i(TAG, "Adreno $model${if (gpu.oneUi8Gen2) " (One UI)" else ""}, system driver ${version ?: "n/a"}, mode $mode: ${cached ?: "driver default"}") return cached } - fun applyToProcess() { - val value = forThisDevice() ?: return + fun restartRequired(context: Context): Boolean = resolved && activeMode != SessionPrefs.tpUbwcMode(context) + + fun applyToProcess(context: Context) { + val value = forThisDevice(context) ?: 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/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 5d5861d3a7..7c7a6d4192 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -263,6 +263,19 @@ object SessionPrefs { const val GPU_DRIVERS_MANUAL = "manual" const val GPU_DRIVERS_MIX = "mix" + const val TP_UBWC_AUTO = "auto" + const val TP_UBWC_ON = "on" + const val TP_UBWC_OFF = "off" + + fun tpUbwcMode(context: Context): String = + prefs(context).getString("tpUbwcMode", TP_UBWC_AUTO) + ?.takeIf { it in setOf(TP_UBWC_AUTO, TP_UBWC_ON, TP_UBWC_OFF) } ?: TP_UBWC_AUTO + + fun setTpUbwcMode(context: Context, mode: String) { + require(mode in setOf(TP_UBWC_AUTO, TP_UBWC_ON, TP_UBWC_OFF)) + prefs(context).edit().putString("tpUbwcMode", mode).commit() + } + fun gpuDriverMode(context: Context): String = prefs(context).getString("gpuDriverMode", GPU_DRIVERS_AUTO) ?: GPU_DRIVERS_AUTO 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 44f6cc4c4c..723b4d36db 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -397,7 +397,7 @@ class SessionService : Service() { private fun runSession(gen: Int) { SessionTerminal.clear() - com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice() + com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this) try { LinuxRuntime.writeAccounts(this) } catch (e: Exception) { @@ -696,7 +696,7 @@ class SessionService : Service() { val tuOverride = tuDebugOverride() val tuDriver = sysmemDriver(linuxDriverId) (tuOverride ?: "sysmem".takeIf { tuDriver || SessionPrefs.tuSysmem(this) })?.let { guest.add("TU_DEBUG=$it") } - com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice()?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } + com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this)?.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/ui/GpuDriversPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt index 47905485db..8474050c34 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt @@ -23,6 +23,7 @@ import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.AnnotatedString import com.droiddeck.launcher.gpu.DeviceInfo +import com.droiddeck.launcher.session.SessionPrefs import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import androidx.compose.ui.res.stringResource @@ -128,6 +129,8 @@ class GpuDriversState( val runtime: DriverSlot = DriverSlot(), val canRestart: Boolean = true, val checkedAt: Long = 0L, + val tpUbwcMode: String? = null, + val tpUbwcRestartRequired: Boolean = false, ) { val activePair: PairRow? get() = pairs.firstOrNull { it.active } } @@ -147,6 +150,7 @@ class GpuDriversActions( val onRestoreBundled: () -> Unit = {}, val onMode: (String) -> Unit = {}, val onRestart: () -> Unit = {}, + val onTpUbwcMode: (String) -> Unit = {}, ) @Composable @@ -259,6 +263,27 @@ internal fun GpuDriversBody( GPU_MODE_PAIR -> PairBody(gpu, actions) else -> MixBody(single, actions, slotFocus, onOpenSlot) } + gpu.tpUbwcMode?.let { selected -> + var advanced by rememberSaveable { mutableStateOf(false) } + SecondaryButton(stringResource(R.string.gpu_advanced) + if (advanced) " ▴" else " ▾", modifier = Modifier.fillMaxWidth()) { advanced = !advanced } + AnimatedVisibility(advanced) { + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { + ChoiceRow( + rememberMenuHost(), "tp-ubwc", stringResource(R.string.gpu_ubwc_title), + stringResource(R.string.gpu_ubwc_hint), + listOf( + SessionPrefs.TP_UBWC_AUTO to stringResource(R.string.common_auto), + SessionPrefs.TP_UBWC_ON to stringResource(R.string.widgets_on), + SessionPrefs.TP_UBWC_OFF to stringResource(R.string.widgets_off), + ), selected, onPick = actions.onTpUbwcMode, + ) + if (gpu.tpUbwcRestartRequired) { + Text(stringResource(R.string.gpu_ubwc_restart), fontSize = 13.sp, color = AttentionAmber) + if (gpu.canRestart) SecondaryButton(stringResource(R.string.gpu_restart_now), onClick = actions.onRestart) + } + } + } + } } } 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 bb466c1330..348e8ff1fb 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -23,6 +23,7 @@ object CompositorHost { @Synchronized fun startOrAttach( + context: android.content.Context, surface: Surface, xdgRuntimeDir: String, driverPath: String?, @@ -41,7 +42,7 @@ object CompositorHost { resumeVsync() return false } - com.droiddeck.launcher.gpu.TpUbwcHint.applyToProcess() + com.droiddeck.launcher.gpu.TpUbwcHint.applyToProcess(context) WaylandCompositor.nativeStartWithSurface( surface, xdgRuntimeDir, driverPath, libraryName, nativeLibDir, ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 26fe5a93e8..3f33d6dc2e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1103,6 +1103,9 @@ Hide drivers for other GPUs Show drivers for other GPUs Advanced + UBWC compatibility + Try On or Off if Steam or Android shows stripes or flickering. Applies to both drivers after restarting DroidDeck. + Restart DroidDeck to apply. Set together with the display driver: %1$s carries both. Set together with the runtime driver: %1$s carries both. Used by games and the desktop. diff --git a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt index afcb0d4b5d..2a1286a2ea 100644 --- a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt @@ -53,4 +53,18 @@ class DriverMenusAutoTest { assertEquals("chosen-display", SessionPrefs.androidDriver(activity)) assertEquals("chosen-linux", SessionPrefs.linuxDriver(activity)) } + + @Test fun driverMenusCanBeConstructedBeforeActivityContextIsAttached() { + val menus = DriverMenus(Activity(), Handler(Looper.getMainLooper())) + assertEquals(SessionPrefs.TP_UBWC_AUTO, menus.tpUbwcMode) + } + + @Test fun refreshingDriversLoadsTheSavedUbwcModeAfterContextAttachment() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + SessionPrefs.setTpUbwcMode(activity, SessionPrefs.TP_UBWC_ON) + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.refreshDrivers() + assertEquals(SessionPrefs.TP_UBWC_ON, menus.tpUbwcMode) + assertFalse(menus.state().tpUbwcRestartRequired) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt index fe5183cfa2..774a5ab9bc 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.gpu import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test +import com.droiddeck.launcher.session.SessionPrefs class TpUbwcHintTest { @Test fun a740OnABlobV6xxTurnsTheHintOff() { @@ -18,6 +19,24 @@ class TpUbwcHintTest { assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, null, samsung = true)) } + @Test fun onOverridesThePocoRuleEvenWhenTheVersionIsUnreadable() { + for (version in listOf("512.676.1", "512.676.53", "garbage", null)) { + assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, version, mode = SessionPrefs.TP_UBWC_ON)) + } + } + + @Test fun offOverridesSamsungAndNewerBlobs() { + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.762.10", mode = SessionPrefs.TP_UBWC_OFF)) + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, null, samsung = true, mode = SessionPrefs.TP_UBWC_OFF)) + } + + @Test fun overridesDoNotApplyToOtherGpus() { + for (mode in listOf(SessionPrefs.TP_UBWC_ON, SessionPrefs.TP_UBWC_OFF)) { + assertNull(TpUbwcHint.features(750, "512.762.10", mode = mode)) + assertNull(TpUbwcHint.features(0, null, mode = mode)) + } + } + @Test fun otherGpusKeepTheirDriverDefault() { assertNull(TpUbwcHint.features(750, "512.762.10")) assertNull(TpUbwcHint.features(830, "512.676.53")) diff --git a/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt new file mode 100644 index 0000000000..205fc66e88 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt @@ -0,0 +1,51 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.gpu.TpUbwcHint +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class TpUbwcPrefsTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + + @Before fun reset() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } + + @Test fun missingOrInvalidChoiceUsesAuto() { + assertEquals(SessionPrefs.TP_UBWC_AUTO, SessionPrefs.tpUbwcMode(context)) + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putString("tpUbwcMode", "invalid").commit() + assertEquals(SessionPrefs.TP_UBWC_AUTO, SessionPrefs.tpUbwcMode(context)) + } + + @Test fun overrideIsStoredWithoutChangingDriverChoices() { + SessionPrefs.setAndroidDriver(context, "display") + SessionPrefs.setLinuxDriver(context, "runtime") + for (mode in listOf(SessionPrefs.TP_UBWC_ON, SessionPrefs.TP_UBWC_OFF, SessionPrefs.TP_UBWC_AUTO)) { + SessionPrefs.setTpUbwcMode(context, mode) + assertEquals(mode, SessionPrefs.tpUbwcMode(context)) + assertEquals("display", SessionPrefs.androidDriver(context)) + assertEquals("runtime", SessionPrefs.linuxDriver(context)) + } + } + + @Test fun changingTheSavedChoiceKeepsTheProcessChoiceUntilRestart() { + SessionPrefs.setTpUbwcMode(context, SessionPrefs.TP_UBWC_ON) + val initial = TpUbwcHint.forThisDevice(context) + SessionPrefs.setTpUbwcMode(context, SessionPrefs.TP_UBWC_OFF) + assertTrue(TpUbwcHint.restartRequired(context)) + assertEquals(SessionPrefs.TP_UBWC_ON, TpUbwcHint.activeMode) + assertEquals(initial, TpUbwcHint.forThisDevice(context)) + SessionPrefs.setTpUbwcMode(context, SessionPrefs.TP_UBWC_ON) + assertFalse(TpUbwcHint.restartRequired(context)) + } +}