diff -Nru nvidia-graphics-drivers-390-390.144/debian/changelog nvidia-graphics-drivers-390-390.144/debian/changelog --- nvidia-graphics-drivers-390-390.144/debian/changelog 2021-09-06 13:45:47.000000000 +0100 +++ nvidia-graphics-drivers-390-390.144/debian/changelog 2021-10-11 12:27:19.000000000 +0100 @@ -1,3 +1,11 @@ +nvidia-graphics-drivers-390 (390.144-0ubuntu3) impish; urgency=medium + + * debian/dkms_nvidia/patches/buildfix_kernel_5.13_armhf.patch, + debian/templates/dkms_nvidia.conf.in: + - Fix armhf builds. LP: #1946642 + + -- Dimitri John Ledkov Mon, 11 Oct 2021 12:27:19 +0100 + nvidia-graphics-drivers-390 (390.144-0ubuntu2) impish; urgency=medium * debian/dkms_nvidia/patches/buildfix_kernel_5.14.patch, diff -Nru nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia/patches/buildfix_kernel_5.13_armhf.patch nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia/patches/buildfix_kernel_5.13_armhf.patch --- nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia/patches/buildfix_kernel_5.13_armhf.patch 1970-01-01 01:00:00.000000000 +0100 +++ nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia/patches/buildfix_kernel_5.13_armhf.patch 2021-10-11 12:24:56.000000000 +0100 @@ -0,0 +1,27 @@ +From c88b4c4299fc384ab8bc10e9099c11657a8fa616 Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov +Date: Mon, 11 Oct 2021 12:22:21 +0100 +Subject: [PATCH] Fix ftbfs on armhf, due to outer_sync -> arm_heay_mb change. + +BugLink: https://bugs.launchpad.net/bugs/1946642 +Signed-off-by: Dimitri John Ledkov +--- + nvidia-drm/nvidia-drm-linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nvidia-drm/nvidia-drm-linux.c b/nvidia-drm/nvidia-drm-linux.c +index d9e4ecff40..0962e8a62c 100644 +--- a/nvidia-drm/nvidia-drm-linux.c ++++ b/nvidia-drm/nvidia-drm-linux.c +@@ -75,7 +75,7 @@ char *nv_drm_asprintf(const char *fmt, ...) + #define WRITE_COMBINE_FLUSH() asm volatile("sfence":::"memory") + #elif defined(NVCPU_FAMILY_ARM) + #if defined(NVCPU_ARM) +- #define WRITE_COMBINE_FLUSH() { dsb(); outer_sync(); } ++ #define WRITE_COMBINE_FLUSH() { dsb(); arm_heavy_mb(); } + #elif defined(NVCPU_AARCH64) + #define WRITE_COMBINE_FLUSH() mb() + #endif +-- +2.30.2 + diff -Nru nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia.conf nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia.conf --- nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia.conf 2021-09-06 13:45:47.000000000 +0100 +++ nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia.conf 2021-10-11 12:26:54.000000000 +0100 @@ -26,5 +26,6 @@ AUTOINSTALL="yes" PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch" PATCH[1]="buildfix_kernel_5.14.patch" +PATCH[2]="buildfix_kernel_5.13_armhf.patch" #PATCH[1]="do-not-call-pci_save_state.patch" #PATCH_MATCH[0]="^4.[6-7]" diff -Nru nvidia-graphics-drivers-390-390.144/debian/templates/dkms_nvidia.conf.in nvidia-graphics-drivers-390-390.144/debian/templates/dkms_nvidia.conf.in --- nvidia-graphics-drivers-390-390.144/debian/templates/dkms_nvidia.conf.in 2021-09-06 13:45:02.000000000 +0100 +++ nvidia-graphics-drivers-390-390.144/debian/templates/dkms_nvidia.conf.in 2021-10-11 12:27:06.000000000 +0100 @@ -26,5 +26,6 @@ AUTOINSTALL="yes" PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch" PATCH[1]="buildfix_kernel_5.14.patch" +PATCH[2]="buildfix_kernel_5.13_armhf.patch" #PATCH[1]="do-not-call-pci_save_state.patch" #PATCH_MATCH[0]="^4.[6-7]"