diff --git a/meta-lxatac-bsp/recipes-core/images/lxatac-core-image-base.bbappend b/meta-lxatac-bsp/recipes-core/images/lxatac-core-image-base.bbappend
index af458bcd..da8baffa 100644
--- a/meta-lxatac-bsp/recipes-core/images/lxatac-core-image-base.bbappend
+++ b/meta-lxatac-bsp/recipes-core/images/lxatac-core-image-base.bbappend
@@ -1,7 +1,12 @@
 inherit bootspec
 
 BOOTSPEC_EXTRALINE = "linux-appendroot true\n"
-BOOTSPEC_OPTIONS += "rootwait"
+
+# The drm_leak_fbdev_smem option is a workaround required since Linux 6.11
+# because without it the tacd will crash when attempting to write to the
+# framebuffer. This is likely a bug in the panel-mipi-dbi driver or the tacd
+# that should be fixed there.
+BOOTSPEC_OPTIONS += "rootwait drm_kms_helper.drm_leak_fbdev_smem=1"
 
 IMAGE_INSTALL:append = "\
     kernel-image \
diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig
index 0b7fe9f4..ce9cc651 100644
--- a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig
+++ b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig
@@ -3826,7 +3826,7 @@ CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_GEM_DMA_HELPER=y