From 920e72b77afd35efd7367181f62955dfe8682623 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sun, 5 Oct 2025 19:04:29 -0400
Subject: [PATCH 1/3] add option to flag off DRI3, enable vaapi if detected

---
 Dockerfile                                  | 1 +
 Dockerfile.aarch64                          | 1 +
 root/etc/s6-overlay/s6-rc.d/svc-selkies/run | 4 ++++
 root/etc/s6-overlay/s6-rc.d/svc-xorg/run    | 3 +++
 4 files changed, 9 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 9689d800..791b7c03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,6 +58,7 @@ ENV DISPLAY=:1 \
     SELKIES_INTERPOSER=/usr/lib/selkies_joystick_interposer.so \
     NVIDIA_DRIVER_CAPABILITIES=all \
     DISABLE_ZINK=false \
+    DISABLE_DRI3=false \
     TITLE=Selkies
 
 RUN \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 0a8ac403..771eab44 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -58,6 +58,7 @@ ENV DISPLAY=:1 \
     SELKIES_INTERPOSER=/usr/lib/selkies_joystick_interposer.so \
     NVIDIA_DRIVER_CAPABILITIES=all \
     DISABLE_ZINK=false \
+    DISABLE_DRI3=false \
     TITLE=Selkies
 
 RUN \
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-selkies/run b/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
index 9c9c5f94..4943a1ad 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
@@ -56,6 +56,10 @@ if [ ! -z ${DEV_MODE+x} ]; then
       --mode="websockets"
 fi
 
+# Enable vaapi if device detected
+if ! which nvidia-smi && [ -e "/dev/dri/renderD128" ] && [ ! -z ${DRI_NODE+x} ]; then
+  DRI_NODE="/dev/dri/renderD128"
+fi
 
 # Start Selkies
 exec s6-setuidgid abc \
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xorg/run b/root/etc/s6-overlay/s6-rc.d/svc-xorg/run
index a18da553..f6af77ea 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-xorg/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-xorg/run
@@ -8,6 +8,9 @@ fi
 if [ ! -z ${DRINODE+x} ]; then
   VFBCOMMAND="-vfbdevice ${DRINODE}"
 fi
+if [ "${DISABLE_DRI3}" != "false" ]; then
+  VFBCOMMAND=""
+fi
 DEFAULT_RES="15360x8640"
 if [ ! -z ${MAX_RES+x} ]; then
   DEFAULT_RES="${MAX_RES}"

From 32ff9e76e1111d6bd485d736193ee1a7d15ed8ab Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sun, 5 Oct 2025 19:17:27 -0400
Subject: [PATCH 2/3] bug bashing

---
 root/etc/s6-overlay/s6-rc.d/svc-selkies/run | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-selkies/run b/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
index 4943a1ad..22aeed3c 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
@@ -57,8 +57,8 @@ if [ ! -z ${DEV_MODE+x} ]; then
 fi
 
 # Enable vaapi if device detected
-if ! which nvidia-smi && [ -e "/dev/dri/renderD128" ] && [ ! -z ${DRI_NODE+x} ]; then
-  DRI_NODE="/dev/dri/renderD128"
+if ! which nvidia-smi && [ -e "/dev/dri/renderD128" ] && [ -z ${DRI_NODE+x} ]; then
+  export DRI_NODE="/dev/dri/renderD128"
 fi
 
 # Start Selkies

From 960e644b68b57632aefd9fdb3e56c2b5fbd5c3e8 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Fri, 10 Oct 2025 08:14:40 -0400
Subject: [PATCH 3/3] no vaapi default yet

---
 root/etc/s6-overlay/s6-rc.d/svc-selkies/run | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-selkies/run b/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
index 22aeed3c..fd863a29 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-selkies/run
@@ -56,11 +56,6 @@ if [ ! -z ${DEV_MODE+x} ]; then
       --mode="websockets"
 fi
 
-# Enable vaapi if device detected
-if ! which nvidia-smi && [ -e "/dev/dri/renderD128" ] && [ -z ${DRI_NODE+x} ]; then
-  export DRI_NODE="/dev/dri/renderD128"
-fi
-
 # Start Selkies
 exec s6-setuidgid abc \
   selkies \