diff -u mesa-21.2.6/debian/changelog mesa-21.2.6/debian/changelog
--- mesa-21.2.6/debian/changelog
+++ mesa-21.2.6/debian/changelog
@@ -1,3 +1,11 @@
+mesa (21.2.6-0ubuntu0.1~20.04.2ppa5) focal; urgency=medium
+
+  [ Aurelien Jarno ]
+  * Disable llvmpipe and Vulkan swrast support on riscv64, as the required
+    LLVM JIT is not supported on that architecture. (Debian #1004039)
+
+ -- Isaac True <isaac.true@canonical.com>  Wed, 09 Nov 2022 19:17:10 +0000
+
 mesa (21.2.6-0ubuntu0.1~20.04.2ppa1) focal; urgency=medium
 
   * Enable building lima drivers on riscv64
diff -u mesa-21.2.6/debian/rules mesa-21.2.6/debian/rules
--- mesa-21.2.6/debian/rules
+++ mesa-21.2.6/debian/rules
@@ -65,10 +65,15 @@
 
   # radv/lavapipe needs LLVM and the Vulkan loader, so only build on the subset of
   # arches where we have LLVM enabled and where the Vulkan loader is built.
-  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64))
+  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
 	VULKAN_DRIVERS += amd swrast
   endif
 
+  # Only enable amd on riscv64, swrast needs CPU JIT support which doesn't work yet
+  ifneq (,$(filter $(DEB_HOST_ARCH), riscv64))
+	VULKAN_DRIVERS += amd
+  endif
+
   ifeq ($(DEB_HOST_ARCH_OS), linux)
 	confflags_DRI3 = -Ddri3=enabled
 	DRI_DRIVERS += nouveau
@@ -142,6 +147,11 @@
   ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
 	confflags_GALLIUM += -Dgallium-va=enabled
   endif
+
+  # llvmpipe needs CPU JIT support which doesn't work yet
+  ifneq (,$(filter $(DEB_HOST_ARCH), riscv64))
+	confflags_GALLIUM += -Ddraw-use-llvm=false
+  endif
 endif