diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 257cb2d00..3aa3077c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -135,8 +135,10 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl detail = if (!p.complete) activity.getString(R.string.drivers_half_published) else activity.getString(R.string.drivers_pair_size, mb), recommended = p.key == recommended, suits = p.suits(gpu), complete = p.complete, installed = displayId != null && linuxId != null, - active = displayId != null && linuxId != null && - SessionPrefs.androidDriver(activity) == displayId && SessionPrefs.linuxDriver(activity) == linuxId, + active = displayId != null && linuxId != null && SessionPrefs.linuxDriver(activity) == linuxId && + (SessionPrefs.androidDriver(activity) == displayId || + // A Mali pair under Auto: the display is the phone's own driver. + (gpu.family.mali && DriverPairs.isNonAdreno(p.key) && SessionPrefs.androidDriver(activity) == TurnipDriver.AUTO)), ) }.sortedByDescending { it.recommended } } @@ -164,6 +166,15 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl refreshDrivers() return } + // A Mali pair set by an earlier build put its PanVK Android half on the display, which fails + // on Mali gralloc. Under Auto the display is the phone's own driver (Android's loader). + if (gpu.family.mali) { + val display = SessionPrefs.androidDriver(activity) + if (display.isNotEmpty() && DriverPairs.isNonAdreno(DriverBundle.containing(activity, display, false)?.id)) { + SessionPrefs.setAndroidDriver(activity, TurnipDriver.AUTO) + Log.i(TAG, "auto: Mali display back on the phone's own driver (was $display)") + } + } if (!force && autoCheckedThisProcess) return autoCheckedThisProcess = true if (gpu.family.mali && DriverPairs.recommendedKey(gpu, emptyList()) == null && diff --git a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java index a66c491a2..b45acb9a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java +++ b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java @@ -221,7 +221,8 @@ public class PulseAudioComponent extends SessionPart { } } line = loadedAs != null ? "== client sink: DirectAudio did not come up at start; retried and got " + loadedAs - : "== client sink: DirectAudio did not come up and the AAudio fallback failed too after 5 retries - no client sound"; + : "== client sink: DirectAudio did not come up and the AAudio fallback failed too after 5 retries - no client sound." + + " If audio.log shows AAUDIO_ERROR_DISCONNECTED, Android refused the audio output: rebooting the phone usually fixes this"; Log.w(TAG, line); } Log.i(TAG, line); diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java index 108cd1ec1..3bcb2e7d5 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java @@ -317,6 +317,17 @@ public final class TurnipDriver { private String choose() { SessionPrefs.ensurePowerVrAutoDrivers(context); String chosen = SessionPrefs.androidDriver(context); + // A Mali under Auto draws its display on Android's own Vulkan loader, whatever an earlier + // build set: a PanVK Android half fails on Mali gralloc. A manual pick is respected. + if (chosen != null && !chosen.isEmpty() && new File("/dev/mali0").exists() + && !com.droiddeck.launcher.core.DeviceSupport.INSTANCE.adreno() + && SessionPrefs.GPU_DRIVERS_AUTO.equals(SessionPrefs.gpuDriverMode(context))) { + DriverBundle.Bundle bundle = DriverBundle.INSTANCE.containing(context, chosen, false); + if (bundle != null && DriverPairs.INSTANCE.isNonAdreno(bundle.getId())) { + Log.i(TAG, "Mali under Auto: display on the system Vulkan loader, not " + chosen); + return null; + } + } if (chosen != null && !chosen.isEmpty()) { if (BUNDLED.contains(chosen)) { Log.i(TAG, "driver pinned by the user: " + chosen); diff --git a/app/src/main/java/com/droiddeck/launcher/session/GraphicsReport.kt b/app/src/main/java/com/droiddeck/launcher/session/GraphicsReport.kt index beebb78c6..3a283ea31 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GraphicsReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GraphicsReport.kt @@ -160,7 +160,11 @@ object GraphicsReport { val guestLines = File(dir, "session.log").takeIf { it.isFile }?.useLines { seq -> seq.filter { GUEST.containsMatchIn(it) }.take(200).toList() }.orEmpty() + val audio = File(dir, "audio.log").takeIf { it.isFile }?.readText().orEmpty() report.appendText(buildString { + if (audio.contains("AAUDIO_ERROR_DISCONNECTED")) { + appendLine("!! SOUND: Android refused the audio output (AAUDIO_ERROR_DISCONNECTED) - rebooting the phone usually fixes this") + } if (guestLines.any { it.contains("vkbridge", ignoreCase = true) && it.contains("FAIL") }) { appendLine("!! MALI BRIDGE SELF-TEST FAILED: this GPU's driver did not pass the bridge's checks (see below)") }