x11-drivers/nvidia-drivers-340.65 patch for 3.18 kernels
This commit is contained in:
Sergey Morozov
parent
593a4cca00
commit
a3f057205e
|
|
@ -0,0 +1,17 @@
|
|||
AUX 95-nvidia-settings 54 SHA256 c4b293c6c2659bebcbad9cffc1e237c6908a3763599e432aba89d07bc2826ba0 SHA512 0fdaff8701598081eeb78defcd140b78f75309ace998df67569a15d0ff653aca7ad0576912bf9a619f42990e6fb35cdb79e21f8181d3cd04dea719d912da8be9 WHIRLPOOL d71fef01f8c346089ef2556ffe62c5094f89582b73500711a7f18f25424e59baa12f6b0861bd8efd9bf4c5bbf794642927ca322cee218fd2da9fc7baa50fa827
|
||||
AUX nvidia-169.07 639 SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 SHA512 3af295c026280dc3a2b73c2cc7772254686b09cad15f1333ab0b4de8cb0ccf78e725ced2a399b10edcf8af6ba42ab1485dc0661af67461b0c3789f786357772f WHIRLPOOL 626ae3c01c879e0cfe05bd373e0b9dfd6f462dd9ef6ae94a7d60276fe2d17c57fbb20aaa4d2a186a0ffc2a860076692aac854d00a3545bc9736e7bb8d0581055
|
||||
AUX nvidia-drivers-331.13-pax-usercopy.patch 2127 SHA256 669ffcab77432f116c2b9bc7ed55e2a1f4e208ff19b63d43003af2b346f7c0c0 SHA512 c6ebd534d1e88fe5c1b71ef5ccced8957e34931cab72d1adb4017c703fc2e285f6e36a778bb36a319f505cfe6408be098569944aa5d78c00c8837ffe880d006a WHIRLPOOL 798d3f3edeae2361f039372f5fe13cf9df5aef20ee63c7cdc83e806cbad097b0ddccd6b30968c2b2ceb768ad0425b02aaefe1ba41709e3f0fb79a82f908579a6
|
||||
AUX nvidia-drivers-337.12-pax-constify.patch 1042 SHA256 abb0c616a1187fd1958fea3e9fe8d3a9207d393cb9b76ccbf9f25f44c427ffc5 SHA512 203b0baf036e4f301959516ab17b6748814bed850bc79da30ae524a3c902fda57942587aba0803ad25891fb4867d88a003658b630849e12bc2c95015a62661b0 WHIRLPOOL 1ca05ff6737455032babf352ce08fdcefd5a006c3c4bc3607385896a5b0b3961fb9c7e1ff0010a28041ff9f9d49e35210d0d350df534a0e238df3e82f7023c64
|
||||
AUX nvidia-drivers-340.65-set_busid.patch 1468 SHA256 2c2218204479d787a2c339f724ffc6f80743a16000ff3e99c7e841821ed4151f SHA512 7fcd4c05d0daf85aee50bc41726a72927826439fdd6447410961a3760917c0c5bb8e9f2958b0d1787cbdb29558fb4a1d0a80d4aa8b0dcc4c51989c3f8bf4aecb WHIRLPOOL 0552a7371bfa431dc72e98f2c6b779921f1dc135746c4529c25522e622225f45029350265fda9052fe5bdd0fffe90ccde66fbfee06b0b566946c15fe52442253
|
||||
AUX nvidia-drivers-settings.desktop 193 SHA256 31c062449b8bcc8adcd3ee649d8aebf0bef502400bcbbbb46124217e1efb17a3 SHA512 fbb81d2520e9025fbffb2a8e7b3647f621ddc9d36c79d063d49e901286e8d1ea45de1274f42e33ff1aece5cebd547a42829d65b421db39d808947554b0f57453 WHIRLPOOL c797eb0ec1044ecaaa979ca5180f840d9c82c5c040dd81b2d86ca4afade9f0c006fb8951f04cc4d2b206110d38b339690386d291ff8f625a22b38178a3cd970b
|
||||
AUX nvidia-persistenced.conf 250 SHA256 347437868119e8ae12852a574597936e855f534a9ad290fef3f62b4083a38516 SHA512 9c9562bb15bf4552754dd50a1b01dec5df76f7f5666fba2fff642a169f87e9ed421a260f2258ab469f7e4cd9ef8161653355795624387fe7ad5ae6a0d71e5f46 WHIRLPOOL 1422504c6688fce28719146c7d95fe196ca617556942e8dc04c7f8c1412fa80b5b8289c0f86b835eece90eed4b4017093d686779f88d44cd41fa3de1a10e9bbe
|
||||
AUX nvidia-persistenced.init 778 SHA256 b2a0a60b76090a78deddd7cdc323dcc1717530b0e7a3b51c069127ba3fe015b9 SHA512 6ed419ba17a1d273ca9024e74ebc24135e5cbc041f15019ec1266a48d69c206a7b2792bccdd623db3c65a8192d893f27e8b1593d79bdac7cb5fcd255b81c217b WHIRLPOOL 46113daf493157c6fc97511094f6d2032a65485145d372ac27c3120aebfe1d4051c9ec7122eba373db2eb57a7a227f671fa84c7603f05c823bb977f2dc9910c4
|
||||
AUX nvidia-smi.init 664 SHA256 c996033b81cc1512d8370d62575a0ea0c694f6e1b91cc948b4529625130601a7 SHA512 f7cc27d6cce7c13adecb0b927680979ca6a398bc742a93492ab7f85702e4442d8fc00c476f381a0177ae031a9ae45c5cbb6777f20c545d5cd695150f9551a4ce WHIRLPOOL 66bf1a70fa0038a54ca9254cd5543f61bdc69a4c070544660f4ef9b2a004d28f1defdb26b1bc102b1eabd24e679f36fec14c9b313fba4b54c7a9a51a73ca021e
|
||||
AUX nvidia-udev.sh 185 SHA256 120c0af2b64fbcbd7032217a78eec8b104874c1ca68726367bce22c57944e07e SHA512 166df3a4e7c1862ca2e0f634bf5eed7aad1bdd7e55764ca42371b91a7077c59f0bc243de5616fd38dac9694159d1695d54fbd08ac89d4d3f3649c70c7db5977e WHIRLPOOL cb9995029cdb2fe1bc7fe5ae54041ee5de8da86bf5eb3616d062475e56c44d436e1e66683ecddd986fc5bca5723d88da4b1a42f65f3cd7e15636928bd21fce14
|
||||
AUX nvidia-uvm.conf 82 SHA256 4407c7ceed58ead98492560c07fc44d4285a70ed5165407f1b959e46d6e6d081 SHA512 cbdb946934a0b7c7d0fab0937ead0a161ff20238e0b53f9e05ea18a4fa0507df8d37594bd13402e3ec2001d488daeb2bec718d612f68202768d62a3cec97aacb WHIRLPOOL a79d65d67b0ff446bb2c65f5f3ec16ffaf0268ab0abbc137b413168aa7f5e617e502eaaf00fd21a149778bdd134da532b25bb066fc70bfa601caa97397aaf424
|
||||
AUX nvidia.udev-rule 462 SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48e7d30f1e3b469ac6 SHA512 96f9edaa0b46bea5fce17596f868bea5265b303d7185af6ba81527bbd7b8fdf92de9311317cbde51a29d222083d451c25ab77c3d6837cbc4072a50d9af89aa86 WHIRLPOOL 89ed95f33db7485a3a1acd91df33ecdfb7d0a249db2d7674f134fb85b35a54653d0458e478503315ce506ae5d3c8dcd4ac20420711fdbdd087ea4bd779627d13
|
||||
DIST NVIDIA-FreeBSD-x86-340.65.tar.gz 59368245 SHA256 e8b5df30c4c2fd7b715d143dca987894bf4d3c28e43132c0cd02143cc0d96d5a SHA512 280d3dd928a6660885d8bdb93bd1fb93a2f19856ea72ce2423fcee4804e465e73ff6c62ad7221826dd95c4d337be42b86991733cecc5a7a9adb33a8460af7727 WHIRLPOOL 467a668d8f3074c0ae3296b97c737cd68e13a049825d1c08ee9cc74e81339a55c04f98a52373e984996f01a3969492a4408f2ac532ee7769e725549079416644
|
||||
DIST NVIDIA-FreeBSD-x86_64-340.65.tar.gz 60204269 SHA256 b613d806d02686bd61b6dcbed1ba29f63a009a504a2a59094208328aac08a029 SHA512 e04f892ce0771a8261d3b3b4168230af5d0ef9e864d2af9c6ec5de41e7d030f7c8e7696f66bb410b2ff17b3f24b0642584bbab0d5787bac9f8a7a4242f5a1c13 WHIRLPOOL 7f4324ef2fd98904224b7c12ab4822c68c8ab0281d1013fd24609773971b8ac18d5c87772f84465ddf24859152f3da99893e07bb52651a84ce162e18919734fe
|
||||
DIST NVIDIA-Linux-x86-340.65.run 38831415 SHA256 e78511435d7794cac09916b98857d98d0c36607ac4dfde0b05ea4aef26ecd973 SHA512 7a67b4d75469696b27a0f474a67982634a2df108d941dbe80c3b0502f30c40f885ea3838e41a52526b424f94eaa9cae44590db1855f8e0303999beb0fe95bcdb WHIRLPOOL a8e5233ccb9aa0dbc3981529fbe2c56c6cedb1ad2e9df4f67e3bace2cde872e7c55adb3bf8e84dcaede3003f1e8d718e464997fddf1f73574088ce4082e4a8ca
|
||||
DIST NVIDIA-Linux-x86_64-340.65.run 69903305 SHA256 cd3948db5c1e2468c50140efb4bb50f1a4c84c923db8ec756bd56ff35df9ff04 SHA512 dbc1ffd5c5c2ddf82530c2575d1219662bc630ba23cd38816c4500e7d4549a6345213029b947dca319b6bed367aff96d9f27c681cb9c511916ba0b4c35134d33 WHIRLPOOL 23eefb5142d29e886dece47f2e40ff2b27348b6b2e97883cebb630b074a852aa726c4fed6e01b736dc314dfe6b901534e1f46c68d82b99adb00ebe0c72358aea
|
||||
EBUILD nvidia-drivers-340.65.ebuild 13690 SHA256 ede1283895893f76550007c94eea9dd12d3f69d71bb0477e653af12c05ae8fe9 SHA512 4be8856a55f7afcf4b8423b9e9d9cb7e253665c3a112c24adc9f37c2f7117398b1b7c8db5119f2aa778b7b88a526758a45437ff6a29d18e78e1bc752ec1bb395 WHIRLPOOL 43cd31fc3da1f471ca15f3d35b854e6d40d7b4541d378c5815d7e6ea611280c7d3546a89af399a7e83f76c03ee317d0a4f186954889397d0fc133d5550744eb1
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
/opt/bin/nvidia-settings --load-config-only
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
# Nvidia drivers support
|
||||
alias char-major-195 nvidia
|
||||
alias /dev/nvidiactl char-major-195
|
||||
|
||||
# To tweak the driver the following options can be used, note that
|
||||
# you should be careful, as it could cause instability!! For more
|
||||
# options see /usr/share/doc/PACKAGE/README
|
||||
#
|
||||
# !!! SECURITY WARNING !!!
|
||||
# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
|
||||
# WHAT YOU ARE DOING.
|
||||
# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
|
||||
# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
|
||||
options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
--- a/kernel/nv-linux.h
|
||||
+++ b/kernel/nv-linux.h
|
||||
@@ -757,16 +757,16 @@
|
||||
|
||||
#if defined(NV_KMEM_CACHE_CREATE_PRESENT)
|
||||
#if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 6)
|
||||
-#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type) \
|
||||
+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags) \
|
||||
{ \
|
||||
kmem_cache = kmem_cache_create(name, sizeof(type), \
|
||||
- 0, 0, NULL, NULL); \
|
||||
+ 0, flags, NULL, NULL); \
|
||||
}
|
||||
#elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
|
||||
-#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type) \
|
||||
+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags) \
|
||||
{ \
|
||||
kmem_cache = kmem_cache_create(name, sizeof(type), \
|
||||
- 0, 0, NULL); \
|
||||
+ 0, flags, NULL); \
|
||||
}
|
||||
#else
|
||||
#error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
|
||||
--- a/kernel/nv.c
|
||||
+++ b/kernel/nv.c
|
||||
@@ -794,7 +794,7 @@
|
||||
NV_SPIN_LOCK_INIT(&km_lock);
|
||||
#endif
|
||||
|
||||
- NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
|
||||
+ NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t, SLAB_USERCOPY);
|
||||
if (nv_stack_t_cache == NULL)
|
||||
{
|
||||
nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
|
||||
@@ -924,7 +924,7 @@
|
||||
nv->os_state = (void *) &nv_ctl_device;
|
||||
nv_lock_init_locks(nv);
|
||||
|
||||
- NV_KMEM_CACHE_CREATE(nv_pte_t_cache, NV_PTE_CACHE_STR, nv_pte_t);
|
||||
+ NV_KMEM_CACHE_CREATE(nv_pte_t_cache, NV_PTE_CACHE_STR, nv_pte_t, 0);
|
||||
if (nv_pte_t_cache == NULL)
|
||||
{
|
||||
rc = -ENOMEM;
|
||||
@@ -935,7 +935,7 @@
|
||||
if (NV_BUILD_MODULE_INSTANCES == 0)
|
||||
{
|
||||
NV_KMEM_CACHE_CREATE(nvidia_p2p_page_t_cache, "nvidia_p2p_page_t",
|
||||
- nvidia_p2p_page_t);
|
||||
+ nvidia_p2p_page_t, 0);
|
||||
if (nvidia_p2p_page_t_cache == NULL)
|
||||
{
|
||||
rc = -ENOMEM;
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
--- a/kernel/uvm/nvidia_uvm_common.c
|
||||
+++ b/kernel/uvm/nvidia_uvm_common.c
|
||||
@@ -95,7 +95,6 @@ static RM_STATUS uvmnext_gpu_event_stop_
|
||||
#endif // NVIDIA_UVM_NEXT_ENABLED
|
||||
|
||||
static dev_t g_uvmBaseDev;
|
||||
-struct UvmOpsUvmEvents g_exportedUvmOps;
|
||||
|
||||
// TODO: This would be easier if RM allowed for multiple registrations, since we
|
||||
// could register UVM-Lite and UVM-Next separately (bug 1372835).
|
||||
@@ -147,9 +146,11 @@ static RM_STATUS uvmSetupGpuProvider(voi
|
||||
RM_STATUS status = RM_OK;
|
||||
|
||||
#ifdef NVIDIA_UVM_RM_ENABLED
|
||||
- g_exportedUvmOps.startDevice = uvm_gpu_event_start_device;
|
||||
- g_exportedUvmOps.stopDevice = uvm_gpu_event_stop_device;
|
||||
- g_exportedUvmOps.isrTopHalf = uvmnext_isr_top_half;
|
||||
+ static struct UvmOpsUvmEvents g_exportedUvmOps = {
|
||||
+ .startDevice = uvm_gpu_event_start_device,
|
||||
+ .stopDevice = uvm_gpu_event_stop_device,
|
||||
+ .isrTopHalf = uvmnext_isr_top_half,
|
||||
+ };
|
||||
|
||||
// call RM to exchange the function pointers.
|
||||
status = nvUvmInterfaceRegisterUvmCallbacks(&g_exportedUvmOps);
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
--- kernel/nv-drm.c~ 2014-11-08 00:57:53.000000000 +0100
|
||||
+++ kernel/nv-drm.c 2014-11-13 21:03:37.589650873 +0100
|
||||
@@ -128,6 +128,10 @@ static struct drm_driver nv_drm_driver =
|
||||
.gem_prime_vmap = nv_gem_prime_vmap,
|
||||
.gem_prime_vunmap = nv_gem_prime_vunmap,
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
|
||||
+ .set_busid = drm_pci_set_busid,
|
||||
+#endif
|
||||
+
|
||||
.name = "nvidia-drm",
|
||||
.desc = "NVIDIA DRM driver",
|
||||
.date = "20130102",
|
||||
diff --git a/nv-frontend.c~ b/nv-frontend.c
|
||||
index c8c8af1..00f0973 100644
|
||||
--- kernel/nv-frontend.c~
|
||||
+++ kernel/nv-frontend.c
|
||||
@@ -327,7 +327,7 @@ long nvidia_frontend_unlocked_ioctl(
|
||||
unsigned long i_arg
|
||||
)
|
||||
{
|
||||
- return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
|
||||
+ return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
|
||||
}
|
||||
|
||||
long nvidia_frontend_compat_ioctl(
|
||||
@@ -336,7 +336,7 @@ long nvidia_frontend_compat_ioctl(
|
||||
unsigned long i_arg
|
||||
)
|
||||
{
|
||||
- return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
|
||||
+ return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
|
||||
}
|
||||
|
||||
int nvidia_frontend_mmap(
|
||||
diff --git a/nv.c~ b/nv.c
|
||||
index 6b31000..3db114e 100644
|
||||
--- kernel/nv.c~
|
||||
+++ kernel/nv.c
|
||||
@@ -1796,7 +1796,7 @@ nvidia_unlocked_ioctl(
|
||||
unsigned long i_arg
|
||||
)
|
||||
{
|
||||
- return nvidia_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
|
||||
+ return nvidia_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=NVIDIA X Server Settings
|
||||
Comment=Configure NVIDIA X Server Settings
|
||||
Exec=/opt/bin/nvidia-settings
|
||||
Icon=nvidia-drivers-settings
|
||||
Categories=System;Settings;
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
# run-time configuration file for /etc/init.d/nvidia-persistenced
|
||||
|
||||
# NVPD_USER: The user nvidia-persistenced is intended to run for
|
||||
NVPD_USER=""
|
||||
|
||||
# ARGS: Additional arguments to set the default persistence mode
|
||||
# (see nvidia-persistenced(1))
|
||||
ARGS=""
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
#!/sbin/runscript
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init,v 1.2 2014/09/19 22:09:28 jer Exp $
|
||||
|
||||
pidfile="/var/run/nvidia-persistenced/nvidia-persistenced.pid"
|
||||
|
||||
start() {
|
||||
if ! [ "${NVPD_USER}x" = x ]; then
|
||||
ebegin "Starting nvidia-persistenced for ${NVPD_USER}"
|
||||
NVPD_USER_ARG="--user ${NVPD_USER}"
|
||||
else
|
||||
ebegin "Starting nvidia-persistenced"
|
||||
fi
|
||||
start-stop-daemon --start --quiet --pidfile ${pidfile} \
|
||||
--background --exec /opt/bin/nvidia-persistenced \
|
||||
-- ${NVPD_USER_ARG} ${ARGS}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping nvidia-persistenced"
|
||||
start-stop-daemon --stop --quiet --pidfile ${pidfile}
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
#!/sbin/runscript
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-smi.init,v 1.2 2013/05/09 16:32:00 jer Exp $
|
||||
|
||||
pidfile="/run/nvidia-smi.pid"
|
||||
|
||||
depend() {
|
||||
after modules
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting NVIDIA System Management Interface"
|
||||
rm -f ${pidfile}
|
||||
start-stop-daemon --start --quiet --pidfile ${pidfile} \
|
||||
--make-pidfile --background --exec /opt/bin/nvidia-smi -- \
|
||||
-q -l 300
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping NVIDIA System Management Interface"
|
||||
start-stop-daemon --stop --quiet --pidfile ${pidfile}
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/sh
|
||||
|
||||
if [ $# -ne 1 ]; then
|
||||
echo "Invalid args" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case $1 in
|
||||
add|ADD)
|
||||
/opt/bin/nvidia-smi > /dev/null
|
||||
;;
|
||||
remove|REMOVE)
|
||||
rm -f /dev/nvidia*
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Nvidia UVM support
|
||||
|
||||
remove nvidia modprobe -r --ignore-remove nvidia-uvm nvidia
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
ACTION=="add", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}"
|
||||
# Previously the ACTION was "add|remove" but one user on bug #376527 had a
|
||||
# problem until he recompiled udev-171-r5, which is one of the versions I
|
||||
# tested with and it was fine. I'm breaking the rules out just to be safe
|
||||
# so someone else doesn't have an issue
|
||||
ACTION=="remove", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}"
|
||||
|
|
@ -0,0 +1,486 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-340.65.ebuild,v 1.2 2014/12/12 09:45:25 jer Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
|
||||
portability toolchain-funcs unpacker user udev
|
||||
|
||||
NV_URI="http://us.download.nvidia.com/XFree86/"
|
||||
X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
|
||||
AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
|
||||
X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
|
||||
AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
|
||||
|
||||
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
|
||||
HOMEPAGE="http://www.nvidia.com/"
|
||||
SRC_URI="
|
||||
amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
|
||||
amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
|
||||
x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
|
||||
x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
|
||||
"
|
||||
|
||||
LICENSE="GPL-2 NVIDIA-r2"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
|
||||
IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
|
||||
RESTRICT="bindist mirror strip"
|
||||
EMULTILIB_PKG="true"
|
||||
|
||||
COMMON="
|
||||
app-admin/eselect-opencl
|
||||
kernel_linux? ( >=sys-libs/glibc-2.6.1 )
|
||||
X? (
|
||||
>=app-admin/eselect-opengl-1.0.9
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON}
|
||||
app-arch/xz-utils
|
||||
kernel_linux? ( virtual/linux-sources )
|
||||
"
|
||||
RDEPEND="
|
||||
${COMMON}
|
||||
acpi? ( sys-power/acpid )
|
||||
tools? (
|
||||
dev-libs/atk
|
||||
dev-libs/glib
|
||||
x11-libs/gdk-pixbuf
|
||||
>=x11-libs/gtk+-2.4:2
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/pango[X]
|
||||
)
|
||||
X? (
|
||||
<x11-base/xorg-server-1.16.99:=
|
||||
>=x11-libs/libvdpau-0.3-r1
|
||||
multilib? (
|
||||
|| (
|
||||
(
|
||||
>=x11-libs/libX11-1.6.2[abi_x86_32]
|
||||
>=x11-libs/libXext-1.3.2[abi_x86_32]
|
||||
)
|
||||
app-emulation/emul-linux-x86-xlibs
|
||||
)
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
REQUIRED_USE="tools? ( X )"
|
||||
|
||||
QA_PREBUILT="opt/* usr/lib*"
|
||||
|
||||
S=${WORKDIR}/
|
||||
|
||||
pkg_pretend() {
|
||||
|
||||
if use amd64 && has_multilib_profile && \
|
||||
[ "${DEFAULT_ABI}" != "amd64" ]; then
|
||||
eerror "This ebuild doesn't currently support changing your default ABI"
|
||||
die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
|
||||
fi
|
||||
|
||||
if use kernel_linux && kernel_is ge 3 18 ; then
|
||||
ewarn "Gentoo supports kernels which are supported by NVIDIA"
|
||||
ewarn "which are limited to the following kernels:"
|
||||
ewarn "<sys-kernel/gentoo-sources-3.18"
|
||||
ewarn "<sys-kernel/vanilla-sources-3.18"
|
||||
ewarn ""
|
||||
ewarn "You are free to utilize epatch_user to provide whatever"
|
||||
ewarn "support you feel is appropriate, but will not receive"
|
||||
ewarn "support as a result of those changes."
|
||||
ewarn ""
|
||||
ewarn "Do not file a bug report about this."
|
||||
fi
|
||||
|
||||
# Since Nvidia ships 3 different series of drivers, we need to give the user
|
||||
# some kind of guidance as to what version they should install. This tries
|
||||
# to point the user in the right direction but can't be perfect. check
|
||||
# nvidia-driver.eclass
|
||||
nvidia-driver-check-warning
|
||||
|
||||
# Kernel features/options to check for
|
||||
CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
|
||||
use x86 && CONFIG_CHECK+=" ~HIGHMEM"
|
||||
|
||||
# Now do the above checks
|
||||
use kernel_linux && check_extra_config
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
# try to turn off distcc and ccache for people that have a problem with it
|
||||
export DISTCC_DISABLE=1
|
||||
export CCACHE_DISABLE=1
|
||||
|
||||
if use kernel_linux; then
|
||||
MODULE_NAMES="nvidia(video:${S}/kernel)"
|
||||
use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
|
||||
|
||||
# This needs to run after MODULE_NAMES (so that the eclass checks
|
||||
# whether the kernel supports loadable modules) but before BUILD_PARAMS
|
||||
# is set (so that KV_DIR is populated).
|
||||
linux-mod_pkg_setup
|
||||
|
||||
BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
|
||||
SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
|
||||
|
||||
# linux-mod_src_compile calls set_arch_to_kernel, which
|
||||
# sets the ARCH to x86 but NVIDIA's wrapping Makefile
|
||||
# expects x86_64 or i386 and then converts it to x86
|
||||
# later on in the build process
|
||||
BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
|
||||
fi
|
||||
|
||||
# set variables to where files are in the package structure
|
||||
if use kernel_FreeBSD; then
|
||||
use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
|
||||
use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
|
||||
NV_DOC="${S}/doc"
|
||||
NV_OBJ="${S}/obj"
|
||||
NV_SRC="${S}/src"
|
||||
NV_MAN="${S}/x11/man"
|
||||
NV_X11="${S}/obj"
|
||||
NV_SOVER=1
|
||||
elif use kernel_linux; then
|
||||
NV_DOC="${S}"
|
||||
NV_OBJ="${S}"
|
||||
NV_SRC="${S}/kernel"
|
||||
NV_MAN="${S}"
|
||||
NV_X11="${S}"
|
||||
NV_SOVER=${PV}
|
||||
else
|
||||
die "Could not determine proper NVIDIA package"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Please add a brief description for every added patch
|
||||
|
||||
if use kernel_linux; then
|
||||
if kernel_is lt 2 6 9 ; then
|
||||
eerror "You must build this against 2.6.9 or higher kernels."
|
||||
fi
|
||||
|
||||
# If greater than 2.6.5 use M= instead of SUBDIR=
|
||||
# convert_to_m "${NV_SRC}"/Makefile.kbuild
|
||||
fi
|
||||
|
||||
if use pax_kernel; then
|
||||
ewarn "Using PAX patches is not supported. You will be asked to"
|
||||
ewarn "use a standard kernel should you have issues. Should you"
|
||||
ewarn "need support with these patches, contact the PaX team."
|
||||
epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
|
||||
epatch "${FILESDIR}"/${PN}-337.12-pax-constify.patch
|
||||
fi
|
||||
|
||||
# Allow user patches so they can support RC kernels and whatever else
|
||||
epatch "${FILESDIR}"/${P}-set_busid.patch
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# This is already the default on Linux, as there's no toplevel Makefile, but
|
||||
# on FreeBSD there's one and triggers the kernel module build, as we install
|
||||
# it by itself, pass this.
|
||||
|
||||
cd "${NV_SRC}"
|
||||
if use kernel_FreeBSD; then
|
||||
MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
|
||||
LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
|
||||
elif use kernel_linux; then
|
||||
use uvm && MAKEOPTS=-j1
|
||||
linux-mod_src_compile
|
||||
fi
|
||||
}
|
||||
|
||||
# Install nvidia library:
|
||||
# the first parameter is the library to install
|
||||
# the second parameter is the provided soversion
|
||||
# the third parameter is the target directory if its not /usr/lib
|
||||
donvidia() {
|
||||
# Full path to library minus SOVER
|
||||
MY_LIB="$1"
|
||||
|
||||
# SOVER to use
|
||||
MY_SOVER="$2"
|
||||
|
||||
# Where to install
|
||||
MY_DEST="$3"
|
||||
|
||||
if [[ -z "${MY_DEST}" ]]; then
|
||||
MY_DEST="/usr/$(get_libdir)"
|
||||
action="dolib.so"
|
||||
else
|
||||
exeinto ${MY_DEST}
|
||||
action="doexe"
|
||||
fi
|
||||
|
||||
# Get just the library name
|
||||
libname=$(basename $1)
|
||||
|
||||
# Install the library with the correct SOVER
|
||||
${action} ${MY_LIB}.${MY_SOVER} || \
|
||||
die "failed to install ${libname}"
|
||||
|
||||
# If SOVER wasn't 1, then we need to create a .1 symlink
|
||||
if [[ "${MY_SOVER}" != "1" ]]; then
|
||||
dosym ${libname}.${MY_SOVER} \
|
||||
${MY_DEST}/${libname}.1 || \
|
||||
die "failed to create ${libname} symlink"
|
||||
fi
|
||||
|
||||
# Always create the symlink from the raw lib to the .1
|
||||
dosym ${libname}.1 \
|
||||
${MY_DEST}/${libname} || \
|
||||
die "failed to create ${libname} symlink"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use kernel_linux; then
|
||||
linux-mod_src_install
|
||||
|
||||
# Add the aliases
|
||||
# This file is tweaked with the appropriate video group in
|
||||
# pkg_preinst, see bug #491414
|
||||
insinto /etc/modprobe.d
|
||||
newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
|
||||
use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
|
||||
|
||||
# Ensures that our device nodes are created when not using X
|
||||
exeinto "$(get_udevdir)"
|
||||
doexe "${FILESDIR}"/nvidia-udev.sh
|
||||
udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
|
||||
elif use kernel_FreeBSD; then
|
||||
if use x86-fbsd; then
|
||||
insinto /boot/modules
|
||||
doins "${S}/src/nvidia.kld"
|
||||
fi
|
||||
|
||||
exeinto /boot/modules
|
||||
doexe "${S}/src/nvidia.ko"
|
||||
fi
|
||||
|
||||
# NVIDIA kernel <-> userspace driver config lib
|
||||
donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
|
||||
|
||||
# NVIDIA framebuffer capture library
|
||||
donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
|
||||
|
||||
# NVIDIA video encode/decode <-> CUDA
|
||||
if use kernel_linux; then
|
||||
donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
|
||||
donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
# Xorg DDX driver
|
||||
insinto /usr/$(get_libdir)/xorg/modules/drivers
|
||||
doins ${NV_X11}/nvidia_drv.so
|
||||
|
||||
# Xorg GLX driver
|
||||
donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
|
||||
/usr/$(get_libdir)/opengl/nvidia/extensions
|
||||
fi
|
||||
|
||||
# OpenCL ICD for NVIDIA
|
||||
if use kernel_linux; then
|
||||
insinto /etc/OpenCL/vendors
|
||||
doins ${NV_OBJ}/nvidia.icd
|
||||
fi
|
||||
|
||||
# Documentation
|
||||
dohtml ${NV_DOC}/html/*
|
||||
if use kernel_FreeBSD; then
|
||||
dodoc "${NV_DOC}/README"
|
||||
use X && doman "${NV_MAN}/nvidia-xconfig.1"
|
||||
use tools && doman "${NV_MAN}/nvidia-settings.1"
|
||||
else
|
||||
# Docs
|
||||
newdoc "${NV_DOC}/README.txt" README
|
||||
dodoc "${NV_DOC}/NVIDIA_Changelog"
|
||||
doman "${NV_MAN}/nvidia-smi.1.gz"
|
||||
use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
|
||||
use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
|
||||
doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
|
||||
fi
|
||||
|
||||
# Helper Apps
|
||||
exeinto /opt/bin/
|
||||
|
||||
if use X; then
|
||||
doexe ${NV_OBJ}/nvidia-xconfig
|
||||
fi
|
||||
|
||||
if use kernel_linux ; then
|
||||
doexe ${NV_OBJ}/nvidia-cuda-mps-control
|
||||
doexe ${NV_OBJ}/nvidia-cuda-mps-server
|
||||
doexe ${NV_OBJ}/nvidia-debugdump
|
||||
doexe ${NV_OBJ}/nvidia-persistenced
|
||||
doexe ${NV_OBJ}/nvidia-smi
|
||||
|
||||
# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
|
||||
doexe ${NV_OBJ}/nvidia-modprobe
|
||||
fowners root:video /opt/bin/nvidia-modprobe
|
||||
fperms 4710 /opt/bin/nvidia-modprobe
|
||||
dosym /{opt,usr}/bin/nvidia-modprobe
|
||||
|
||||
doman nvidia-cuda-mps-control.1.gz
|
||||
doman nvidia-modprobe.1.gz
|
||||
doman nvidia-persistenced.1.gz
|
||||
newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
|
||||
newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
|
||||
newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
|
||||
fi
|
||||
|
||||
if use tools; then
|
||||
doexe ${NV_OBJ}/nvidia-settings
|
||||
insinto /usr/share/nvidia/
|
||||
doins nvidia-application-profiles-${PV}-key-documentation
|
||||
insinto /etc/nvidia
|
||||
newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
|
||||
fi
|
||||
|
||||
exeinto /usr/bin/
|
||||
doexe ${NV_OBJ}/nvidia-bug-report.sh
|
||||
|
||||
# Desktop entries for nvidia-settings
|
||||
if use tools ; then
|
||||
# There is no icon in the FreeBSD tarball.
|
||||
use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
|
||||
domenu "${FILESDIR}"/${PN}-settings.desktop
|
||||
exeinto /etc/X11/xinit/xinitrc.d
|
||||
doexe "${FILESDIR}"/95-nvidia-settings
|
||||
fi
|
||||
|
||||
#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
|
||||
|
||||
if has_multilib_profile && use multilib ; then
|
||||
local OABI=${ABI}
|
||||
for ABI in $(get_install_abis) ; do
|
||||
src_install-libs
|
||||
done
|
||||
ABI=${OABI}
|
||||
unset OABI
|
||||
else
|
||||
src_install-libs
|
||||
fi
|
||||
|
||||
is_final_abi || die "failed to iterate through all ABIs"
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
src_install-libs() {
|
||||
local inslibdir=$(get_libdir)
|
||||
local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
|
||||
local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
|
||||
local libdir=${NV_OBJ}
|
||||
|
||||
if use kernel_linux && has_multilib_profile && \
|
||||
[[ ${ABI} == "x86" ]] ; then
|
||||
libdir=${NV_OBJ}/32
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
# The GLX libraries
|
||||
donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
|
||||
donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
|
||||
donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
|
||||
donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
|
||||
donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
|
||||
donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
|
||||
donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
|
||||
if use kernel_FreeBSD; then
|
||||
donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
|
||||
else
|
||||
donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
|
||||
fi
|
||||
|
||||
# VDPAU
|
||||
donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
|
||||
|
||||
# GLES v2 libraries
|
||||
insinto ${GL_ROOT}
|
||||
doexe ${libdir}/libGLESv2.so.${PV}
|
||||
dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
|
||||
dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
|
||||
fi
|
||||
|
||||
# NVIDIA monitoring library
|
||||
if use kernel_linux ; then
|
||||
donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
|
||||
fi
|
||||
|
||||
# CUDA & OpenCL
|
||||
if use kernel_linux; then
|
||||
donvidia ${libdir}/libcuda.so ${NV_SOVER}
|
||||
donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
|
||||
donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
|
||||
donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if use kernel_linux; then
|
||||
linux-mod_pkg_preinst
|
||||
|
||||
local videogroup="$(egetent group video | cut -d ':' -f 3)"
|
||||
if [ -z "${videogroup}" ]; then
|
||||
eerror "Failed to determine the video group gid"
|
||||
die "Failed to determine the video group gid"
|
||||
else
|
||||
sed -i \
|
||||
-e "s:PACKAGE:${PF}:g" \
|
||||
-e "s:VIDEOGID:${videogroup}:" \
|
||||
"${D}"/etc/modprobe.d/nvidia.conf || die
|
||||
fi
|
||||
fi
|
||||
|
||||
# Clean the dynamic libGL stuff's home to ensure
|
||||
# we dont have stale libs floating around
|
||||
if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
|
||||
rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
|
||||
fi
|
||||
# Make sure we nuke the old nvidia-glx's env.d file
|
||||
if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
|
||||
rm -f "${ROOT}"/etc/env.d/09nvidia
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use kernel_linux && linux-mod_pkg_postinst
|
||||
|
||||
# Switch to the nvidia implementation
|
||||
use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
|
||||
"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
|
||||
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if ! use X; then
|
||||
elog "You have elected to not install the X.org driver. Along with"
|
||||
elog "this the OpenGL libraries and VDPAU libraries were not"
|
||||
elog "installed. Additionally, once the driver is loaded your card"
|
||||
elog "and fan will run at max speed which may not be desirable."
|
||||
elog "Use the 'nvidia-smi' init script to have your card and fan"
|
||||
elog "speed scale appropriately."
|
||||
elog
|
||||
fi
|
||||
if ! use tools; then
|
||||
elog "USE=tools controls whether the nvidia-settings application"
|
||||
elog "is installed. If you would like to use it, enable that"
|
||||
elog "flag and re-emerge this ebuild. Optionally you can install"
|
||||
elog "media-video/nvidia-settings"
|
||||
elog
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use kernel_linux && linux-mod_pkg_postrm
|
||||
use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
|
||||
}
|
||||
Loading…
Reference in New Issue