diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-07-12 16:05:13 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-07-12 16:05:13 +0000 |
commit | 036b7faea8796972f60c8e3dd254313a2cb2d229 (patch) | |
tree | 8c69a801223586a88c0cffd52b59eabb6b997cbd /media-video | |
parent | cdb bindings for python (diff) | |
download | historical-036b7faea8796972f60c8e3dd254313a2cb2d229.tar.gz historical-036b7faea8796972f60c8e3dd254313a2cb2d229.tar.bz2 historical-036b7faea8796972f60c8e3dd254313a2cb2d229.zip |
cleanup + type-o fix
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/nvidia-kernel/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/nvidia-kernel/Manifest | 26 | ||||
-rw-r--r-- | media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff | 38 |
3 files changed, 39 insertions, 32 deletions
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog index 9c4d34621d53..07da150965f0 100644 --- a/media-video/nvidia-kernel/ChangeLog +++ b/media-video/nvidia-kernel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/nvidia-kernel # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.36 2003/07/08 07:04:06 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.37 2003/07/12 16:03:16 azarah Exp $ + + 12 Jul 2003; Martin Schlemmer <azarah@gentoo.org> + files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff: + Cleanup patch a bit more, and fix a type-o that caused the driver to fail + initializing DMA. 23 Jun 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363-r2.ebuild: diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest index b06a987d78b6..f2aad6aa097a 100644 --- a/media-video/nvidia-kernel/Manifest +++ b/media-video/nvidia-kernel/Manifest @@ -1,27 +1,27 @@ +MD5 4dd3750b4cd7e91841f9683655d3dffd ChangeLog 7765 MD5 04b1f361d40708ab81631bea5e46a632 nvidia-kernel-1.0.2880-r1.ebuild 1970 -MD5 76fccda1348aa4c183f690d797c1d24a ChangeLog 7562 MD5 5177ed76121fb4bc1aa220c62319d196 nvidia-kernel-1.0.2960-r1.ebuild 2081 MD5 16a9003f79bea31eeec6f03ae64cd8ef nvidia-kernel-1.0.3123-r2.ebuild 3229 +MD5 4fc62b5769bfcbb15e69c27860bc27e7 nvidia-kernel-1.0.4191-r2.ebuild 3870 MD5 cdcf177830becdf3c2cb628e1d6a6749 nvidia-kernel-1.0.4363-r2.ebuild 4180 MD5 0646bd1f1f1109063862d1475aaccab4 nvidia-kernel-1.0.4349-r2.ebuild 3702 -MD5 4fc62b5769bfcbb15e69c27860bc27e7 nvidia-kernel-1.0.4191-r2.ebuild 3870 -MD5 15c10778db607715e60a461e09d9f54c files/digest-nvidia-kernel-1.0.2960-r1 1122 -MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441 -MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30 -MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74 -MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814 -MD5 f38a4afc671446ad293a46b0046c0aec files/NVIDIA_kernel-1.0-3123-pa.diff 10825 +MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569 MD5 4057597a09dd795c93ce8088d6f023bb files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff 11858 MD5 059b3ddf8944dce6c9184d11d15abd71 files/NVIDIA_kernel-1.0-3123-2.5-tl.diff 31614 -MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74 -MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r2 74 +MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858 +MD5 f38a4afc671446ad293a46b0046c0aec files/NVIDIA_kernel-1.0-3123-pa.diff 10825 MD5 7f987ae6384103d87f323d834bba87a1 files/NVIDIA_kernel-1.0-4191-2.5-tl.diff 39065 MD5 57f69061f52fd98e20c7d62882af2757 files/NVIDIA_kernel-1.0-4191-2.5.54.diff 1228 -MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569 -MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858 +MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814 +MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74 +MD5 15c10778db607715e60a461e09d9f54c files/digest-nvidia-kernel-1.0.2960-r1 1122 +MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74 MD5 854b5c292ec300d7105dbd54385840f6 files/digest-nvidia-kernel-1.0.4191-r2 74 +MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r2 74 +MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30 +MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441 MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r2 74 MD5 31565678620709b117139345323051fd files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5-20030402.diff 70350 MD5 439563bcf7fa96c91361226fae454e0e files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5.68.diff 1467 -MD5 229c0402f2342904e285faec5614ea95 files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff 1425 +MD5 c8b6a9308eb71e5679a7b036128a4d84 files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff 1328 MD5 e08e015c157458037c079e0259cf16a6 files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030614.diff 74562 diff --git a/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff b/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff index a4e00117d9e6..106c9cdaf998 100644 --- a/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff +++ b/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff @@ -1,43 +1,45 @@ -diff -urpN NVIDIA_kernel-1.0-4363.orig/nv-linux.h NVIDIA_kernel-1.0-4363/nv-linux.h ---- NVIDIA_kernel-1.0-4363.orig/nv-linux.h 2003-04-20 03:57:19.000000000 +0200 -+++ NVIDIA_kernel-1.0-4363/nv-linux.h 2003-07-08 07:53:49.000000000 +0200 -@@ -186,6 +186,15 @@ +--- NVIDIA_kernel-1.0-4363.orig/nv-linux.h 2003-07-12 15:06:22.000000000 +0200 ++++ NVIDIA_kernel-1.0-4363/nv-linux.h 2003-07-12 15:18:04.000000000 +0200 +@@ -225,6 +225,16 @@ } #endif +#if defined(pmd_offset_map) -+#define NV_PMD_OFFSET(address, pg_dir) \ -+ pmd_offset_map(pg_dir, address); ++#define NV_PMD_OFFSET(pg_dir, address, pmd) \ ++ pmd = pmd_offset_map(pg_dir, address) +#define NV_PMD_OFFSET_UNMAP 1 +#else -+#define NV_PMD_OFFSET(address, pg_dir) \ -+ pmd_offset(pg_dir, address) ++#define NV_PMD_OFFSET(pg_dir, address, pmd) \ ++ pmd = pmd_offset(pg_dir, address) ++#undef NV_PMD_OFFSET_UNMAP +#endif + #define NV_PAGE_ALIGN(addr) ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE) #define NV_MASK_OFFSET(addr) ( (addr) & (PAGE_SIZE - 1) ) -diff -urpN NVIDIA_kernel-1.0-4363.orig/nv.c NVIDIA_kernel-1.0-4363/nv.c ---- NVIDIA_kernel-1.0-4363.orig/nv.c 2003-04-20 03:57:19.000000000 +0200 -+++ NVIDIA_kernel-1.0-4363/nv.c 2003-07-08 07:55:09.000000000 +0200 -@@ -2191,11 +2191,18 @@ nv_get_phys_address(unsigned long addres +--- NVIDIA_kernel-1.0-4363.orig/nv.c 2003-07-12 15:06:22.000000000 +0200 ++++ NVIDIA_kernel-1.0-4363/nv.c 2003-07-12 15:22:13.000000000 +0200 +@@ -2105,12 +2105,20 @@ nv_get_phys_address(unsigned long addres if (pgd_none(*pg_dir)) goto failed; - pg_mid_dir = pmd_offset(pg_dir, address); - if (pmd_none(*pg_mid_dir)) -+ pg_mid_dir = NV_PMD_OFFSET(pg_dir, address); +- goto failed; ++ NV_PMD_OFFSET(pg_dir, address, pg_mid_dir); + if (pmd_none(*pg_mid_dir)) { +#if defined(NV_PMD_OFFSET_UNMAP) -+ pmd_unmap(pg_mid_dir); ++ pmd_unmap(pg_mid_dir); +#endif - goto failed; -+ } ++ goto failed; ++ } NV_PTE_OFFSET(address, pg_mid_dir, pte); + +#if defined(NV_PMD_OFFSET_UNMAP) -+ pmd_unmap(pg_mid_dir); ++ pmd_unmap(pg_mid_dir); +#endif - ++ if (!pte_present(pte)) goto failed; + |