1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
diff -ur kernel/nvidia-drm/nvidia-drm-drv.c kernel-patched/nvidia-drm/nvidia-drm-drv.c
--- kernel/nvidia-drm/nvidia-drm-drv.c 2016-08-09 02:43:19.000000000 +0300
+++ kernel-patched/nvidia-drm/nvidia-drm-drv.c 2016-08-26 20:14:29.109937200 +0300
@@ -37,6 +37,7 @@
#include "nvidia-drm-ioctl.h"
#include <drm/drmP.h>
+#include <drm/drm_auth.h>
#include <drm/drm_crtc_helper.h>
@@ -420,7 +421,7 @@
static
void nvidia_drm_master_drop(struct drm_device *dev,
- struct drm_file *file_priv, bool from_release)
+ struct drm_file *file_priv)
{
struct nvidia_drm_device *nv_dev = dev->dev_private;
int ret;
@@ -453,7 +454,7 @@
mutex_lock(&dev->master_mutex);
if (!file_priv->is_master ||
- !file_priv->minor->master)
+ !file_priv->master)
{
goto done;
}
@@ -474,7 +475,7 @@
* NVKMS modeset ownership, because nvidia_drm_master_set()'s call to
* grabOwnership() will fail.
*/
- drm_master_put(&file_priv->minor->master);
+ drm_master_put(&file_priv->master);
file_priv->is_master = 0;
ret = 0;
Only in kernel-patched/nvidia-drm: nvidia-drm-drv.c.orig
diff -ur kernel/nvidia-drm/nvidia-drm-fence.c kernel-patched/nvidia-drm/nvidia-drm-fence.c
--- kernel/nvidia-drm/nvidia-drm-fence.c 2016-08-09 02:43:19.000000000 +0300
+++ kernel-patched/nvidia-drm/nvidia-drm-fence.c 2016-08-26 20:14:29.115451900 +0300
@@ -325,7 +325,7 @@
struct nvidia_drm_gem_object *nv_gem;
};
-static void nvidia_drm_gem_prime_soft_fence_event
+static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event
(
void *dataPtr,
NvU32 dataU32
diff -ur kernel/nvidia-drm/nvidia-drm-modeset.c kernel-patched/nvidia-drm/nvidia-drm-modeset.c
--- kernel/nvidia-drm/nvidia-drm-modeset.c 2016-08-09 02:43:19.000000000 +0300
+++ kernel-patched/nvidia-drm/nvidia-drm-modeset.c 2016-08-26 20:14:29.113947800 +0300
@@ -675,7 +675,7 @@
goto failed;
}
- drm_atomic_helper_swap_state(dev, state);
+ drm_atomic_helper_swap_state(state, true);
nvidia_drm_update_head_mode_config(state, requested_config);
|