From 9d6bbedf6bb8bbc1940ba168c8b537e9e17752c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 1 Feb 2015 16:57:51 +0100 Subject: [PATCH] - fix "No drm_driver.set_busid() implementation" BUG() on linux 3.18 - rel 3 --- nvidia-kernel-3.18.patch | 13 +++++++++++++ xorg-driver-video-nvidia.spec | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 nvidia-kernel-3.18.patch diff --git a/nvidia-kernel-3.18.patch b/nvidia-kernel-3.18.patch new file mode 100644 index 0000000..e0d49b4 --- /dev/null +++ b/nvidia-kernel-3.18.patch @@ -0,0 +1,13 @@ +--- 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/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 6fcb639..1eff39d 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -25,7 +25,7 @@ exit 1 %define no_install_post_check_so 1 -%define rel 2 +%define rel 3 %define pname xorg-driver-video-nvidia Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez @@ -47,6 +47,7 @@ Source4: 10-nvidia.conf Source5: 10-nvidia-modules.conf Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch +Patch2: nvidia-kernel-3.18.patch URL: http://www.nvidia.com/object/unix.html BuildRequires: rpmbuild(macros) >= 1.701 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}} @@ -248,6 +249,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}* %endif %patch0 -p1 %patch1 -p1 +%patch2 -p0 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build -- 2.43.0