On 06/04/14 14:18, Ben Hutchings wrote: > > This is bug #749703 and there is a patch available: > <https://bugs.debian.org/749703>. > Ah, I missed this one. I have briefly verified the patch for Wheezy's 3.13 and 3.14 bpo kernels on amd64. The nvidia module loads fine. The XWindow server comes up. Attached is a patch to update the source package. Hope this helps. Harri
diff -urN nvidia-graphics-drivers-319.82.old/debian/changelog nvidia-graphics-drivers-319.82/debian/changelog
--- nvidia-graphics-drivers-319.82.old/debian/changelog 2014-05-23 04:53:12.000000000 +0200
+++ nvidia-graphics-drivers-319.82/debian/changelog 2014-06-05 11:39:56.728038431 +0200
@@ -1,3 +1,10 @@
+nvidia-graphics-drivers (319.82-1~bpo70+2.1) wheezy-backports; urgency=low
+
+ * Non-maintainer upload.
+ * introducing linux-3.13.patch, see #749703
+
+ -- Harald Dunkel <hdunkel@aixigo.de> Thu, 05 Jun 2014 11:38:58 +0200
+
nvidia-graphics-drivers (319.82-1~bpo70+2) wheezy-backports; urgency=medium
* linux-3.14.patch: New. Add support for Linux 3.14.
diff -urN nvidia-graphics-drivers-319.82.old/debian/module/debian/patches/linux-3.13.patch nvidia-graphics-drivers-319.82/debian/module/debian/patches/linux-3.13.patch
--- nvidia-graphics-drivers-319.82.old/debian/module/debian/patches/linux-3.13.patch 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-319.82/debian/module/debian/patches/linux-3.13.patch 2014-06-05 11:37:14.764439102 +0200
@@ -0,0 +1,13 @@
+--- kernel/nv-acpi.c.orig 2013-12-30 09:23:36.000000000 +0100
++++ kernel/nv-acpi.c 2014-06-05 11:34:27.194829353 +0200
+@@ -303,7 +303,10 @@
+
+ if (pNvAcpiObject->notify_handler_installed)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
++/* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
+ NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
++#endif
+
+ // remove event notifier
+ status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
diff -urN nvidia-graphics-drivers-319.82.old/debian/module/debian/patches/series nvidia-graphics-drivers-319.82/debian/module/debian/patches/series
--- nvidia-graphics-drivers-319.82.old/debian/module/debian/patches/series 2014-05-22 12:58:39.000000000 +0200
+++ nvidia-graphics-drivers-319.82/debian/module/debian/patches/series 2014-06-05 11:38:21.248324819 +0200
@@ -3,3 +3,4 @@
use-nv-kernel-ARCH.o_shipped.patch
conditionally-include-linux_version.h.patch
linux-3.14.patch
+linux-3.13.patch
Attachment:
signature.asc
Description: OpenPGP digital signature