MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #41598 from bkchr/nividia_390_67

Browse source 
nvidia_x11: 390.48 -> 390.67
This commit is contained in:
Frederik Rietdijk 2018-06-10 10:22:25 +02:00 committed by GitHub
commit 3b4c68f574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/os-specific/linux/nvidia-x11/default.nix
View file

@ -17,13 +17,11 @@ in
rec {
# Policy: use the highest stable version as the default (on our master).
stable = generic {
version = "390.48";
sha256_32bit = "1y6n2hfz9vd0h7gd31fgxcl76s5pjf8afwqyq5slqpcxpd78j5ai";
sha256_64bit = "16a3blvizcksmaxr644s857yanw3i3vcvqvn7qnwbsbqpmxga09c";
settingsSha256 = "058xaiw5g0kxrvc3lvy4424fqbjkvmsznj2v73cgbm25i1m83krl";
persistencedSha256 = "0y86bhzl42lqyrbibqzf8a8yd49zbq3ryb78vgsl13i44f9sl79k";
patches = [ ./fix_missing_symbol.patch ];
version = "390.67";
sha256_32bit = "01c8fa80njyyr39c1pyf7ssmfq65ci8mapbs94fd6gnhwc7gfjkg";
sha256_64bit = "0np6xj93fali2hss8xsdlmy5ykjgn4hx6mzjr8dpbdi0fhdcmwkd";
settingsSha256 = "1wk4587czysnbj5yxijmv3bldcffzwp4yvfx133apsr31dqca0s7";
persistencedSha256 = "1zia1r97lyj6fbmvsw4hv5qfcj84x3sz971m4430d8qyks2c4sdw";
};
beta = stable; # not enough interest to maintain beta ATM

19
pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch
View file

@ -1,19 +0,0 @@
https://devtalk.nvidia.com/default/topic/1030082/linux/kernel-4-16-rc1-breaks-latest-drivers-unknown-symbol-swiotlb_map_sg_attrs-/
--- a/kernel/common/inc/nv-linux.h~ 2018-01-25 06:09:41.000000000 +0100
+++ b/kernel/common/inc/nv-linux.h 2018-03-05 13:58:17.746725638 +0100
@@ -1209,6 +1209,7 @@ static inline NvU32 nv_alloc_init_flags(
static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
{
NvBool swiotlb_in_use = NV_FALSE;
+#if 0
#if defined(CONFIG_SWIOTLB)
#if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
/*
@@ -1251,7 +1252,7 @@ static inline NvBool nv_dma_maps_swiotlb
swiotlb_in_use = (swiotlb == 1);
#endif
#endif
-
+#endif
return swiotlb_in_use;
}