27 lines
699 B
Diff
27 lines
699 B
Diff
--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
|
|
+++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
|
|
@@ -18,6 +18,11 @@
|
|
|
|
#include <drm/drmP.h>
|
|
|
|
+/* 3.18-rc0+ */
|
|
+#ifndef drm_gem_object
|
|
+#include <drm/drm_gem.h>
|
|
+#endif
|
|
+
|
|
extern nv_linux_state_t *nv_linux_devices;
|
|
|
|
struct nv_gem_object {
|
|
diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
|
|
index ecc982a..60d7aae 100644
|
|
--- kernel/nv-drm.c~
|
|
+++ kernel/nv-drm.c
|
|
@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {
|
|
.gem_prime_vmap = nv_gem_prime_vmap,
|
|
.gem_prime_vunmap = nv_gem_prime_vunmap,
|
|
|
|
+ .set_busid = drm_pci_set_busid,
|
|
+
|
|
.name = "nvidia-drm",
|
|
.desc = "NVIDIA DRM driver",
|
|
.date = "20130102",
|