rpms/nvidia-304xx-kmod/F-19 nvidia-304xx-kmod.spec, 1.26, 1.27 nvidia_304.108_linux_3.11.patch, 1.1, 1.2
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22755
Modified Files:
nvidia-304xx-kmod.spec nvidia_304.108_linux_3.11.patch
Log Message:
* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-2
- use nvidia fix for get_num_physpages
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19/nvidia-304xx-kmod.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nvidia-304xx-kmod.spec 4 Nov 2013 23:19:07 -0000 1.26
+++ nvidia-304xx-kmod.spec 6 Nov 2013 10:47:07 -0000 1.27
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-304xx-kmod
Version: 304.108
# Taken over by kmodtool
-Release: 1%{?dist}.7
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -81,6 +81,9 @@
%changelog
+* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-2
+- use nvidia fix for get_num_physpages
+
* Mon Nov 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.108-1.7
- Rebuilt for kernel
nvidia_304.108_linux_3.11.patch:
b/kernel/patch-get_num_physpages.h | 10 ++++++++++
kernel/Makefile.kbuild | 1 +
kernel/conftest.sh | 24 ++++++++++++++++++++++++
kernel/nv-linux.h | 4 ++++
kernel/nv-vm.c | 5 +++++
5 files changed, 44 insertions(+)
Index: nvidia_304.108_linux_3.11.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19/nvidia_304.108_linux_3.11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia_304.108_linux_3.11.patch 29 Sep 2013 21:47:08 -0000 1.1
+++ nvidia_304.108_linux_3.11.patch 6 Nov 2013 10:47:07 -0000 1.2
@@ -1,10 +1,74 @@
+This patch will work on installers for version 304.108 of the NVIDIA
+Linux driver.
+
+It will not apply cleanly against older 304 drivers, but can be made to
+work with some minor changes.
+
+--- /dev/null
++++ b/kernel/patch-get_num_physpages.h
+@@ -0,0 +1,10 @@
++#define NV_PATCH_get_num_physpages_DESCRIPTION \
++"This patch adds support for kernels such as Linux 3.11, which use the "\
++"get_num_physpages() function instead of the num_physpages variable to "\
++"report the number of physical pages. In order to avoid compatibility "\
++"problems that would otherwise result from differences between what "\
++"the removed num_physpages variable reported versus what is reported "\
++"by get_num_physpages(), the driver will fall back to a different memory "\
++"allocation strategy on systems where num_phsypages is not available, when "\
++"the amount of system memory matches or exceeds the upper bound of a given "\
++"GPU's physical address space.\n"
+
+--- a/kernel/Makefile.kbuild
++++ b/kernel/Makefile.kbuild
+@@ -175,6 +175,7 @@ COMPILE_TESTS = \
+ file_operations \
+ sg_init_table \
+ pci_get_domain_bus_and_slot \
++ get_num_physpages \
+ efi_enabled \
+ proc_create_data \
+ pde_data \
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1551,6 +1551,30 @@ compile_test() {
+ fi
+ ;;
+
++ get_num_physpages)
++ #
++ # Determine if the get_num_physpages() function is
++ # present.
++ #
++ echo "$CONFTEST_PREAMBLE
++ #include <linux/mm.h>
++ void conftest_get_num_physpages(void) {
++ get_num_physpages(NULL);
++ }" > conftest$$.c
++
++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++ rm -f conftest$$.c
++
++ if [ -f conftest$$.o ]; then
++ echo "#undef NV_GET_NUM_PHYSPAGES_PRESENT" >> conftest.h
++ rm -f conftest$$.o
++ return
++ else
++ echo "#define NV_GET_NUM_PHYSPAGES_PRESENT" >> conftest.h
++ return
++ fi
++ ;;
++
+ proc_remove)
+ #
+ # Determine if the proc_remove() function is present.
+
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
-@@ -1028,7 +1028,11 @@ static inline int nv_execute_on_all_cpus
+@@ -1028,7 +1028,11 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info)
#endif
#if !defined(NV_VMWARE)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++#if defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+#define NV_NUM_PHYSPAGES get_num_physpages()
+#else
#define NV_NUM_PHYSPAGES num_physpages
@@ -12,3 +76,20 @@
#define NV_GET_CURRENT_PROCESS() current->tgid
#define NV_IN_ATOMIC() in_atomic()
#define NV_LOCAL_BH_DISABLE() local_bh_disable()
+
+--- a/kernel/nv-vm.c
++++ b/kernel/nv-vm.c
+@@ -479,8 +479,13 @@ static unsigned int nv_compute_gfp_mask(
+ system_memory_size = (os_get_system_memory_size() * RM_PAGE_SIZE);
+ if (system_memory_size != 0)
+ {
++#if !defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+ if (dev->dma_mask < (system_memory_size - 1))
+ gfp_mask = NV_GFP_DMA32;
++#else
++ if (dev->dma_mask <= (system_memory_size - 1))
++ gfp_mask = NV_GFP_DMA32;
++#endif
+ }
+ else if (dev->dma_mask < 0xffffffffffULL)
+ {
10 years, 5 months
rpms/nvidia-304xx-kmod/devel kernel_v3.11.patch, 1.3, 1.4 nvidia-304xx-kmod.spec, 1.3, 1.4
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22614
Modified Files:
kernel_v3.11.patch nvidia-304xx-kmod.spec
Log Message:
* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-4
- use nvidia fix for get_num_physpages
kernel_v3.11.patch:
b/kernel/patch-get_num_physpages.h | 10 ++++++++++
kernel/Makefile.kbuild | 1 +
kernel/conftest.sh | 24 ++++++++++++++++++++++++
kernel/nv-linux.h | 4 ++++
kernel/nv-vm.c | 5 +++++
5 files changed, 44 insertions(+)
Index: kernel_v3.11.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/kernel_v3.11.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel_v3.11.patch 7 Oct 2013 11:03:00 -0000 1.3
+++ kernel_v3.11.patch 6 Nov 2013 10:43:50 -0000 1.4
@@ -1,10 +1,74 @@
+This patch will work on installers for version 304.108 of the NVIDIA
+Linux driver.
+
+It will not apply cleanly against older 304 drivers, but can be made to
+work with some minor changes.
+
+--- /dev/null
++++ b/kernel/patch-get_num_physpages.h
+@@ -0,0 +1,10 @@
++#define NV_PATCH_get_num_physpages_DESCRIPTION \
++"This patch adds support for kernels such as Linux 3.11, which use the "\
++"get_num_physpages() function instead of the num_physpages variable to "\
++"report the number of physical pages. In order to avoid compatibility "\
++"problems that would otherwise result from differences between what "\
++"the removed num_physpages variable reported versus what is reported "\
++"by get_num_physpages(), the driver will fall back to a different memory "\
++"allocation strategy on systems where num_phsypages is not available, when "\
++"the amount of system memory matches or exceeds the upper bound of a given "\
++"GPU's physical address space.\n"
+
+--- a/kernel/Makefile.kbuild
++++ b/kernel/Makefile.kbuild
+@@ -175,6 +175,7 @@ COMPILE_TESTS = \
+ file_operations \
+ sg_init_table \
+ pci_get_domain_bus_and_slot \
++ get_num_physpages \
+ efi_enabled \
+ proc_create_data \
+ pde_data \
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1551,6 +1551,30 @@ compile_test() {
+ fi
+ ;;
+
++ get_num_physpages)
++ #
++ # Determine if the get_num_physpages() function is
++ # present.
++ #
++ echo "$CONFTEST_PREAMBLE
++ #include <linux/mm.h>
++ void conftest_get_num_physpages(void) {
++ get_num_physpages(NULL);
++ }" > conftest$$.c
++
++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++ rm -f conftest$$.c
++
++ if [ -f conftest$$.o ]; then
++ echo "#undef NV_GET_NUM_PHYSPAGES_PRESENT" >> conftest.h
++ rm -f conftest$$.o
++ return
++ else
++ echo "#define NV_GET_NUM_PHYSPAGES_PRESENT" >> conftest.h
++ return
++ fi
++ ;;
++
+ proc_remove)
+ #
+ # Determine if the proc_remove() function is present.
+
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
-@@ -1028,7 +1028,11 @@ static inline int nv_execute_on_all_cpus
+@@ -1028,7 +1028,11 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info)
#endif
#if !defined(NV_VMWARE)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++#if defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+#define NV_NUM_PHYSPAGES get_num_physpages()
+#else
#define NV_NUM_PHYSPAGES num_physpages
@@ -12,3 +76,20 @@
#define NV_GET_CURRENT_PROCESS() current->tgid
#define NV_IN_ATOMIC() in_atomic()
#define NV_LOCAL_BH_DISABLE() local_bh_disable()
+
+--- a/kernel/nv-vm.c
++++ b/kernel/nv-vm.c
+@@ -479,8 +479,13 @@ static unsigned int nv_compute_gfp_mask(
+ system_memory_size = (os_get_system_memory_size() * RM_PAGE_SIZE);
+ if (system_memory_size != 0)
+ {
++#if !defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+ if (dev->dma_mask < (system_memory_size - 1))
+ gfp_mask = NV_GFP_DMA32;
++#else
++ if (dev->dma_mask <= (system_memory_size - 1))
++ gfp_mask = NV_GFP_DMA32;
++#endif
+ }
+ else if (dev->dma_mask < 0xffffffffffULL)
+ {
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-304xx-kmod.spec 25 Sep 2013 20:58:24 -0000 1.3
+++ nvidia-304xx-kmod.spec 6 Nov 2013 10:43:50 -0000 1.4
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.108
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -81,6 +81,9 @@
%changelog
+* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-4
+- use nvidia fix for get_num_physpages
+
* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-3
- patch for 3.12.0 kernel
10 years, 5 months
rpms/nvidia-kmod/F-18 3.11_kernel.patch, 1.1, 1.2 nvidia-kmod.spec, 1.173, 1.174
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21849
Modified Files:
3.11_kernel.patch nvidia-kmod.spec
Log Message:
* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:319.60-3
- use nvidia fix for get_num_physpages
3.11_kernel.patch:
b/kernel/patch-get_num_physpages.h | 10 ++++++++++
kernel/Makefile.kbuild | 1 +
kernel/conftest.sh | 24 ++++++++++++++++++++++++
kernel/nv-linux.h | 4 ++++
kernel/nv-vm.c | 5 +++++
5 files changed, 44 insertions(+)
Index: 3.11_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/3.11_kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 3.11_kernel.patch 10 Oct 2013 19:00:49 -0000 1.1
+++ 3.11_kernel.patch 6 Nov 2013 10:31:11 -0000 1.2
@@ -1,10 +1,75 @@
+This patch will work on installers for version 304.108 of the NVIDIA
+Linux driver.
+
+It will not apply cleanly against older 304 drivers, but can be made to
+work with some minor changes.
+
+--- /dev/null
++++ b/kernel/patch-get_num_physpages.h
+@@ -0,0 +1,10 @@
++#define NV_PATCH_get_num_physpages_DESCRIPTION \
++"This patch adds support for kernels such as Linux 3.11, which use the "\
++"get_num_physpages() function instead of the num_physpages variable to "\
++"report the number of physical pages. In order to avoid compatibility "\
++"problems that would otherwise result from differences between what "\
++"the removed num_physpages variable reported versus what is reported "\
++"by get_num_physpages(), the driver will fall back to a different memory "\
++"allocation strategy on systems where num_phsypages is not available, when "\
++"the amount of system memory matches or exceeds the upper bound of a given "\
++"GPU's physical address space.\n"
+
+--- a/kernel/Makefile.kbuild
++++ b/kernel/Makefile.kbuild
+@@ -180,6 +180,7 @@ COMPILE_TESTS = \
+ file_operations \
+ sg_init_table \
+ pci_get_domain_bus_and_slot \
++ get_num_physpages \
+ efi_enabled \
+ drm_available \
+ proc_create_data \
+
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1754,6 +1754,30 @@ compile_test() {
+ fi
+ ;;
+
++ get_num_physpages)
++ #
++ # Determine if the get_num_physpages() function is
++ # present.
++ #
++ echo "$CONFTEST_PREAMBLE
++ #include <linux/mm.h>
++ void conftest_get_num_physpages(void) {
++ get_num_physpages(NULL);
++ }" > conftest$$.c
++
++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++ rm -f conftest$$.c
++
++ if [ -f conftest$$.o ]; then
++ echo "#undef NV_GET_NUM_PHYSPAGES_PRESENT" >> conftest.h
++ rm -f conftest$$.o
++ return
++ else
++ echo "#define NV_GET_NUM_PHYSPAGES_PRESENT" >> conftest.h
++ return
++ fi
++ ;;
++
+ proc_remove)
+ #
+ # Determine if the proc_remove() function is present.
+
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
-@@ -1037,7 +1037,11 @@ static inline int nv_execute_on_all_cpus
+@@ -1037,7 +1037,11 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info)
#endif
#if !defined(NV_VMWARE)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++#if defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+#define NV_NUM_PHYSPAGES get_num_physpages()
+#else
#define NV_NUM_PHYSPAGES num_physpages
@@ -12,3 +77,20 @@
#define NV_GET_CURRENT_PROCESS() current->tgid
#define NV_IN_ATOMIC() in_atomic()
#define NV_LOCAL_BH_DISABLE() local_bh_disable()
+
+--- a/kernel/nv-vm.c
++++ b/kernel/nv-vm.c
+@@ -475,8 +475,13 @@ static unsigned int nv_compute_gfp_mask(
+ system_memory_size = (os_get_system_memory_size() * RM_PAGE_SIZE);
+ if (system_memory_size != 0)
+ {
++#if !defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+ if (dev->dma_mask < (system_memory_size - 1))
+ gfp_mask = NV_GFP_DMA32;
++#else
++ if (dev->dma_mask <= (system_memory_size - 1))
++ gfp_mask = NV_GFP_DMA32;
++#endif
+ }
+ else if (dev->dma_mask < 0xffffffffffULL)
+ {
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- nvidia-kmod.spec 4 Nov 2013 23:21:33 -0000 1.173
+++ nvidia-kmod.spec 6 Nov 2013 10:31:12 -0000 1.174
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-kmod
Epoch: 1
Version: 319.60
# Taken over by kmodtool
-Release: 2%{?dist}.4
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -79,6 +79,9 @@
%changelog
+* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:319.60-3
+- use nvidia fix for get_num_physpages
+
* Mon Nov 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.60-2.4
- Rebuilt for kernel
10 years, 5 months
rpms/nvidia-kmod/F-19 3.11_kernel.patch, 1.2, 1.3 nvidia-kmod.spec, 1.146, 1.147
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21333
Modified Files:
3.11_kernel.patch nvidia-kmod.spec
Log Message:
* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-2
- use nvidia fix for get_num_physpages
3.11_kernel.patch:
b/kernel/patch-get_num_physpages.h | 10 ++++++++++
kernel/Makefile | 1 +
kernel/conftest.sh | 24 ++++++++++++++++++++++++
kernel/nv-linux.h | 4 ++++
kernel/nv-vm.c | 5 +++++
5 files changed, 44 insertions(+)
Index: 3.11_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/3.11_kernel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 3.11_kernel.patch 29 Sep 2013 23:32:56 -0000 1.2
+++ 3.11_kernel.patch 6 Nov 2013 10:24:32 -0000 1.3
@@ -1,10 +1,79 @@
+This patch will work on installers for the following versions of the
+NVIDIA Linux driver:
+
+325.15
+331.13
+331.17
+
+It will not apply cleanly against older 325 drivers, but can be made to
+work with some minor changes.
+
+--- /dev/null
++++ b/kernel/patch-get_num_physpages.h
+@@ -0,0 +1,10 @@
++#define NV_PATCH_get_num_physpages_DESCRIPTION \
++"This patch adds support for kernels such as Linux 3.11, which use the "\
++"get_num_physpages() function instead of the num_physpages variable to "\
++"report the number of physical pages. In order to avoid compatibility "\
++"problems that would otherwise result from differences between what "\
++"the removed num_physpages variable reported versus what is reported "\
++"by get_num_physpages(), the driver will fall back to a different memory "\
++"allocation strategy on systems where num_phsypages is not available, when "\
++"the amount of system memory matches or exceeds the upper bound of a given "\
++"GPU's physical address space.\n"
+
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -180,6 +180,7 @@ COMPILE_TESTS = \
+ file_operations \
+ sg_init_table \
+ pci_get_domain_bus_and_slot \
++ get_num_physpages \
+ efi_enabled \
+ dom0_kernel_present \
+ drm_available \
+
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1665,6 +1665,30 @@ compile_test() {
+ fi
+ ;;
+
++ get_num_physpages)
++ #
++ # Determine if the get_num_physpages() function is
++ # present.
++ #
++ echo "$CONFTEST_PREAMBLE
++ #include <linux/mm.h>
++ void conftest_get_num_physpages(void) {
++ get_num_physpages(NULL);
++ }" > conftest$$.c
++
++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++ rm -f conftest$$.c
++
++ if [ -f conftest$$.o ]; then
++ echo "#undef NV_GET_NUM_PHYSPAGES_PRESENT" | append_conftest "functions"
++ rm -f conftest$$.o
++ return
++ else
++ echo "#define NV_GET_NUM_PHYSPAGES_PRESENT" | append_conftest "functions"
++ return
++ fi
++ ;;
++
+ proc_remove)
+ #
+ # Determine if the proc_remove() function is present.
+
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
-@@ -957,7 +957,11 @@ static inline int nv_execute_on_all_cpus
+@@ -958,7 +958,11 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info)
#endif
#if !defined(NV_VMWARE)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++#if defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+#define NV_NUM_PHYSPAGES get_num_physpages()
+#else
#define NV_NUM_PHYSPAGES num_physpages
@@ -12,3 +81,20 @@
#define NV_GET_CURRENT_PROCESS() current->tgid
#define NV_IN_ATOMIC() in_atomic()
#define NV_LOCAL_BH_DISABLE() local_bh_disable()
+
+--- a/kernel/nv-vm.c
++++ b/kernel/nv-vm.c
+@@ -432,8 +432,13 @@ static unsigned int nv_compute_gfp_mask(
+ system_memory_size = (os_get_system_memory_size() * RM_PAGE_SIZE);
+ if (system_memory_size != 0)
+ {
++#if !defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+ if (dev->dma_mask < (system_memory_size - 1))
+ gfp_mask = NV_GFP_DMA32;
++#else
++ if (dev->dma_mask <= (system_memory_size - 1))
++ gfp_mask = NV_GFP_DMA32;
++#endif
+ }
+ else if (dev->dma_mask < 0xffffffffffULL)
+ {
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- nvidia-kmod.spec 4 Nov 2013 23:19:15 -0000 1.146
+++ nvidia-kmod.spec 6 Nov 2013 10:24:32 -0000 1.147
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-kmod
Epoch: 1
Version: 325.15
# Taken over by kmodtool
-Release: 1%{?dist}.7
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -78,6 +78,9 @@
%changelog
+* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-2
+- use nvidia fix for get_num_physpages
+
* Mon Nov 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-1.7
- Rebuilt for kernel
10 years, 5 months
rpms/nvidia-kmod/devel kernel_v3.11.patch, 1.3, 1.4 nvidia-kmod.spec, 1.134, 1.135
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20755
Modified Files:
kernel_v3.11.patch nvidia-kmod.spec
Log Message:
* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-4
- use nvidia fix for get_num_physpages
kernel_v3.11.patch:
b/kernel/patch-get_num_physpages.h | 10 ++++++++++
kernel/Makefile | 1 +
kernel/conftest.sh | 24 ++++++++++++++++++++++++
kernel/nv-drm.c | 8 ++++++++
kernel/nv-linux.h | 4 ++++
kernel/nv-vm.c | 5 +++++
6 files changed, 52 insertions(+)
Index: kernel_v3.11.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/kernel_v3.11.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel_v3.11.patch 7 Oct 2013 11:02:18 -0000 1.3
+++ kernel_v3.11.patch 6 Nov 2013 10:17:25 -0000 1.4
@@ -1,10 +1,79 @@
+This patch will work on installers for the following versions of the
+NVIDIA Linux driver:
+
+325.15
+331.13
+331.17
+
+It will not apply cleanly against older 325 drivers, but can be made to
+work with some minor changes.
+
+--- /dev/null
++++ b/kernel/patch-get_num_physpages.h
+@@ -0,0 +1,10 @@
++#define NV_PATCH_get_num_physpages_DESCRIPTION \
++"This patch adds support for kernels such as Linux 3.11, which use the "\
++"get_num_physpages() function instead of the num_physpages variable to "\
++"report the number of physical pages. In order to avoid compatibility "\
++"problems that would otherwise result from differences between what "\
++"the removed num_physpages variable reported versus what is reported "\
++"by get_num_physpages(), the driver will fall back to a different memory "\
++"allocation strategy on systems where num_phsypages is not available, when "\
++"the amount of system memory matches or exceeds the upper bound of a given "\
++"GPU's physical address space.\n"
+
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -180,6 +180,7 @@ COMPILE_TESTS = \
+ file_operations \
+ sg_init_table \
+ pci_get_domain_bus_and_slot \
++ get_num_physpages \
+ efi_enabled \
+ dom0_kernel_present \
+ drm_available \
+
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1665,6 +1665,30 @@ compile_test() {
+ fi
+ ;;
+
++ get_num_physpages)
++ #
++ # Determine if the get_num_physpages() function is
++ # present.
++ #
++ echo "$CONFTEST_PREAMBLE
++ #include <linux/mm.h>
++ void conftest_get_num_physpages(void) {
++ get_num_physpages(NULL);
++ }" > conftest$$.c
++
++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++ rm -f conftest$$.c
++
++ if [ -f conftest$$.o ]; then
++ echo "#undef NV_GET_NUM_PHYSPAGES_PRESENT" | append_conftest "functions"
++ rm -f conftest$$.o
++ return
++ else
++ echo "#define NV_GET_NUM_PHYSPAGES_PRESENT" | append_conftest "functions"
++ return
++ fi
++ ;;
++
+ proc_remove)
+ #
+ # Determine if the proc_remove() function is present.
+
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
-@@ -957,7 +957,11 @@ static inline int nv_execute_on_all_cpus
+@@ -958,7 +958,11 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info)
#endif
#if !defined(NV_VMWARE)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++#if defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+#define NV_NUM_PHYSPAGES get_num_physpages()
+#else
#define NV_NUM_PHYSPAGES num_physpages
@@ -12,6 +81,23 @@
#define NV_GET_CURRENT_PROCESS() current->tgid
#define NV_IN_ATOMIC() in_atomic()
#define NV_LOCAL_BH_DISABLE() local_bh_disable()
+
+--- a/kernel/nv-vm.c
++++ b/kernel/nv-vm.c
+@@ -432,8 +432,13 @@ static unsigned int nv_compute_gfp_mask(
+ system_memory_size = (os_get_system_memory_size() * RM_PAGE_SIZE);
+ if (system_memory_size != 0)
+ {
++#if !defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+ if (dev->dma_mask < (system_memory_size - 1))
+ gfp_mask = NV_GFP_DMA32;
++#else
++ if (dev->dma_mask <= (system_memory_size - 1))
++ gfp_mask = NV_GFP_DMA32;
++#endif
+ }
+ else if (dev->dma_mask < 0xffffffffffULL)
+ {
--- a/kernel/nv-drm.c
+++ b/kernel/nv-drm.c
@@ -106,7 +106,11 @@ static const struct file_operations nv_d
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- nvidia-kmod.spec 16 Sep 2013 15:08:08 -0000 1.134
+++ nvidia-kmod.spec 6 Nov 2013 10:17:25 -0000 1.135
@@ -9,7 +9,7 @@
Epoch: 1
Version: 325.15
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -79,6 +79,9 @@
%changelog
+* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-4
+- use nvidia fix for get_num_physpages
+
* Mon Sep 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-3
- patch for 3.12 git kernel
10 years, 5 months
rpms/mate-applet-streamer/F-18 .cvsignore, 1.2, 1.3 mate-applet-streamer.spec, 1.1, 1.2
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/free/rpms/mate-applet-streamer/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9566
Modified Files:
.cvsignore mate-applet-streamer.spec
Log Message:
* Tue Nov 05 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.4-1
- update to 0.0.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/F-18/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1 Oct 2013 21:53:10 -0000 1.2
+++ .cvsignore 5 Nov 2013 21:00:27 -0000 1.3
@@ -1 +1 @@
-mate-applet-streamer-0.0.1.tar.gz
+mate-applet-streamer-0.0.4.tar.gz
Index: mate-applet-streamer.spec
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/F-18/mate-applet-streamer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mate-applet-streamer.spec 1 Oct 2013 21:53:11 -0000 1.1
+++ mate-applet-streamer.spec 5 Nov 2013 21:00:28 -0000 1.2
@@ -1,11 +1,11 @@
Name: mate-applet-streamer
-Version: 0.0.1
-Release: 3%{?dist}
+Version: 0.0.4
+Release: 1%{?dist}
Summary: MATE online radio streamer applet
Group: Applications/System
License: GPLv2+
URL: http://www.zavedil.com/online-radio-applet
-Source: http://www.zavedil.com/wp-content/uploads/2013/09/%{name}-%{version}.tar.gz
+Source: http://www.zavedil.com/wp-content/uploads/2013/11/%{name}-%{version}.tar.gz
BuildRequires: libnotify-devel
BuildRequires: gstreamer1-devel
@@ -57,14 +57,18 @@
%files -f %{name}.lang
%doc AUTHORS BUGS COPYING ChangeLog README TODO
%{_libexecdir}/streamer_applet
+%{_libdir}/bonobo/servers/StreamerAppletFactory.server
%{_datadir}/mate-panel/applets/org.mate.applets.StreamerApplet.mate-panel-applet
%{_datadir}/dbus-1/services/org.mate.panel.applet.StreamerApplet.service
%dir %{_datadir}/streamer_applet
%{_datadir}/streamer_applet/streamer.sqlite
-%{_datadir}/pixmaps/applet_streamer_*.png
+%{_datadir}/pixmaps/applet_streamer*.png
%{_datadir}/icons/hicolor/*/apps/applet_streamer.png
%changelog
+* Tue Nov 05 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.4-1
+- update to 0.0.4
+
* Tue Sep 17 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.1-3
- rebuild against new source
- remove PackageKit-glib-devel BR
10 years, 5 months
rpms/mate-applet-streamer/F-18 sources,1.2,1.3
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/free/rpms/mate-applet-streamer/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9349
Modified Files:
sources
Log Message:
add new 0.0.4 release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/F-18/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 1 Oct 2013 21:53:11 -0000 1.2
+++ sources 5 Nov 2013 20:57:49 -0000 1.3
@@ -1 +1 @@
-ee281142834906c8d38fc68a6eec7c43 mate-applet-streamer-0.0.1.tar.gz
+fe4b5f7ac531536471e66df9bd4ece2a mate-applet-streamer-0.0.4.tar.gz
10 years, 5 months
rpms/mate-applet-streamer/F-19 .cvsignore, 1.2, 1.3 mate-applet-streamer.spec, 1.1, 1.2
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/free/rpms/mate-applet-streamer/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9004
Modified Files:
.cvsignore mate-applet-streamer.spec
Log Message:
* Tue Nov 05 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.4-1
- update to 0.0.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/F-19/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1 Oct 2013 21:51:14 -0000 1.2
+++ .cvsignore 5 Nov 2013 20:54:47 -0000 1.3
@@ -1 +1 @@
-mate-applet-streamer-0.0.1.tar.gz
+mate-applet-streamer-0.0.4.tar.gz
Index: mate-applet-streamer.spec
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/F-19/mate-applet-streamer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mate-applet-streamer.spec 1 Oct 2013 21:51:15 -0000 1.1
+++ mate-applet-streamer.spec 5 Nov 2013 20:54:47 -0000 1.2
@@ -1,6 +1,6 @@
Name: mate-applet-streamer
-Version: 0.0.1
-Release: 3%{?dist}
+Version: 0.0.4
+Release: 1%{?dist}
Summary: MATE online radio streamer applet
Group: Applications/System
License: GPLv2+
@@ -57,14 +57,18 @@
%files -f %{name}.lang
%doc AUTHORS BUGS COPYING ChangeLog README TODO
%{_libexecdir}/streamer_applet
+%{_libdir}/bonobo/servers/StreamerAppletFactory.server
%{_datadir}/mate-panel/applets/org.mate.applets.StreamerApplet.mate-panel-applet
%{_datadir}/dbus-1/services/org.mate.panel.applet.StreamerApplet.service
%dir %{_datadir}/streamer_applet
%{_datadir}/streamer_applet/streamer.sqlite
-%{_datadir}/pixmaps/applet_streamer_*.png
+%{_datadir}/pixmaps/applet_streamer*.png
%{_datadir}/icons/hicolor/*/apps/applet_streamer.png
%changelog
+* Tue Nov 05 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.4-1
+- update to 0.0.4
+
* Tue Sep 17 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.1-3
- rebuild against new source
- remove PackageKit-glib-devel BR
10 years, 5 months
rpms/mate-applet-streamer/F-19 sources,1.2,1.3
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/free/rpms/mate-applet-streamer/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8539
Modified Files:
sources
Log Message:
upload 0.0.4 release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/F-19/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 1 Oct 2013 21:51:15 -0000 1.2
+++ sources 5 Nov 2013 20:51:36 -0000 1.3
@@ -1 +1 @@
-ee281142834906c8d38fc68a6eec7c43 mate-applet-streamer-0.0.1.tar.gz
+fe4b5f7ac531536471e66df9bd4ece2a mate-applet-streamer-0.0.4.tar.gz
10 years, 5 months
rpms/mate-applet-streamer/devel mate-applet-streamer.spec,1.3,1.4
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/free/rpms/mate-applet-streamer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8193
Modified Files:
mate-applet-streamer.spec
Log Message:
* Tue Nov 05 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.4-3
- bump version again
Index: mate-applet-streamer.spec
===================================================================
RCS file: /cvs/free/rpms/mate-applet-streamer/devel/mate-applet-streamer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mate-applet-streamer.spec 5 Nov 2013 20:07:32 -0000 1.3
+++ mate-applet-streamer.spec 5 Nov 2013 20:41:01 -0000 1.4
@@ -1,6 +1,6 @@
Name: mate-applet-streamer
Version: 0.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: MATE online radio streamer applet
Group: Applications/System
License: GPLv2+
@@ -66,6 +66,9 @@
%{_datadir}/icons/hicolor/*/apps/applet_streamer.png
%changelog
+* Tue Nov 05 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.4-3
+- bump version again
+
* Tue Nov 05 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.0.4-2
- bump version
10 years, 5 months