summarylogtreecommitdiffstats
path: root/FS62142.patch
diff options
context:
space:
mode:
authorDaniel Bermond2020-01-28 18:46:03 +0000
committerDaniel Bermond2020-01-28 18:46:03 +0000
commit0f53f83c79bbbf40ffe17d69f4ea06b3b921a9d3 (patch)
tree9887a1bd54ba597ddc5af238527850bb961fc297 /FS62142.patch
parent227bc80ddc5ddd5a7f026e90df5319196b80e959 (diff)
downloadaur-0f53f83c79bbbf40ffe17d69f4ea06b3b921a9d3.tar.gz
Add fixes for linux 5.5, prime and FS#64317. Update xorg conf file.
- add patch to fix build for linux 5.5 (https://devtalk.nvidia.com/default/topic/1068332/linux/nvidia-driver-does-not-build-on-linux-v5-5-release-candidate-kernel/) - add patch to fix prime for linux 5.4 (https://devtalk.nvidia.com/default/topic/1068045/5-4-kernel-breaks-prime-synchronization-/) - remove patch for FS#62142 as reported by FS#64317
Diffstat (limited to 'FS62142.patch')
-rw-r--r--FS62142.patch12
1 files changed, 0 insertions, 12 deletions
diff --git a/FS62142.patch b/FS62142.patch
deleted file mode 100644
index 887f3366723e..000000000000
--- a/FS62142.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
---- a/kernel/nvidia/nv-dma.c 2019-05-08 01:37:30.000000000 +0000
-+++ b/kernel/nvidia/nv-dma.c 2019-06-08 18:33:00.000000000 +0000
-@@ -613,7 +613,7 @@ static NvBool nv_dma_is_map_resource_imp
- #endif
- }
-
-- return (ops->map_resource != NULL);
-+ return (ops && ops->map_resource);
- #else
- return NV_FALSE;
- #endif