Revert "Revert "experimental integration of nvidia's proprietary driv…

…er 295.40"" This reverts commit 2c0b036.
Webconverger · May 13, 2012 · 0babb4f · 0babb4f
1 parent ef5a11e
commit 0babb4f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 0 deletions.
diff --git a/etc/modprobe.d/nvidia.conf b/etc/modprobe.d/nvidia.conf
@@ -0,0 +1 @@
+blacklist nouveau
diff --git a/lib/modules/3.2.0-2artax1-486/kernel/drivers/video/nvidia.ko b/lib/modules/3.2.0-2artax1-486/kernel/drivers/video/nvidia.ko
diff --git a/lib/modules/3.2.0-2artax1-486/modules.alias b/lib/modules/3.2.0-2artax1-486/modules.alias
@@ -13607,3 +13607,8 @@ alias net-pf-10-proto-132 sctp
 alias net-pf-2-proto-132 sctp
 alias virtio:d00000009v* 9pnet_virtio
 alias rtnl-link-lowpan 6lowpan
+alias char-major-195-* nvidia
+alias pci:v000010DEd00000E00sv*sd*bc04sc80i00* nvidia
+alias pci:v000010DEd00000AA3sv*sd*bc0Bsc40i00* nvidia
+alias pci:v000010DEd*sv*sd*bc03sc02i00* nvidia
+alias pci:v000010DEd*sv*sd*bc03sc00i00* nvidia
diff --git a/lib/modules/3.2.0-2artax1-486/modules.alias.bin b/lib/modules/3.2.0-2artax1-486/modules.alias.bin
diff --git a/lib/modules/3.2.0-2artax1-486/modules.dep b/lib/modules/3.2.0-2artax1-486/modules.dep
@@ -3064,3 +3064,4 @@ kernel/lib/ts_bm.ko:
 kernel/lib/ts_fsm.ko:
 kernel/lib/lru_cache.ko:
 kernel/lib/cordic.ko:
+kernel/drivers/video/nvidia.ko: kernel/drivers/i2c/i2c-core.ko
diff --git a/lib/modules/3.2.0-2artax1-486/modules.dep.bin b/lib/modules/3.2.0-2artax1-486/modules.dep.bin
diff --git a/lib/modules/3.2.0-2artax1-486/modules.symbols b/lib/modules/3.2.0-2artax1-486/modules.symbols
@@ -827,6 +827,7 @@ alias symbol:cx88_set_control cx8800
 alias symbol:i2o_dma_map_sg i2o_core
 alias symbol:mlx4_cq_modify mlx4_core
 alias symbol:__fscache_uncache_all_inode_pages fscache
+alias symbol:nvidia_p2p_get_pages nvidia
 alias symbol:nci_to_errno nci
 alias symbol:snd_hda_enable_beep_device snd_hda_codec
 alias symbol:w1_ds2760_write w1_ds2760
@@ -2195,6 +2196,7 @@ alias symbol:dm_rh_dirty_log dm_region_hash
 alias symbol:ath9k_hw_set_sta_beacon_timers ath9k_hw
 alias symbol:tpm_show_timeouts tpm
 alias symbol:snd_pcm_hw_rule_add snd_pcm
+alias symbol:nvidia_p2p_init_mapping nvidia
 alias symbol:rds_message_add_extension rds
 alias symbol:rds_info_copy rds
 alias symbol:snd_free_pages snd_page_alloc
@@ -3178,6 +3180,7 @@ alias symbol:brcmu_pktq_mdeq brcmutil
 alias symbol:drm_helper_disable_unused_functions drm_kms_helper
 alias symbol:kvm_get_guest_memory_type kvm
 alias symbol:scx200_gpio_shadow scx200
+alias symbol:nvidia_p2p_destroy_mapping nvidia
 alias symbol:l2tp_nl_register_ops l2tp_netlink
 alias symbol:rxrpc_kernel_intercept_rx_messages af_rxrpc
 alias symbol:snd_seq_kernel_client_ctl snd_seq
@@ -3407,6 +3410,7 @@ alias symbol:unregister_capi_driver kernelcapi
 alias symbol:tmsdev_init tms380tr
 alias symbol:i915_gpu_turbo_disable i915
 alias symbol:drm_debug drm
+alias symbol:nvidia_p2p_put_pages nvidia
 alias symbol:ib_get_cached_gid ib_core
 alias symbol:sas_ioctl libsas
 alias symbol:usb_unregister_notify usbcore
@@ -5767,6 +5771,7 @@ alias symbol:pppox_ioctl pppox
 alias symbol:z8530_hdlc_kilostream_85230 z85230
 alias symbol:i2c_dp_aux_add_bus drm_kms_helper
 alias symbol:dlmunlock ocfs2_dlm
+alias symbol:nvidia_p2p_free_page_table nvidia
 alias symbol:mtd_device_unregister mtd
 alias symbol:svc_xprt_names sunrpc
 alias symbol:snd_emu8000_load_reverb_fx snd_sbawe

diff --git a/lib/modules/3.2.0-2artax1-486/modules.symbols.bin b/lib/modules/3.2.0-2artax1-486/modules.symbols.bin