aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/ast/ast_drv.c1
-rw-r--r--drivers/gpu/drm/cirrus/cirrus_drv.c1
-rw-r--r--drivers/gpu/drm/drm_fops.c14
-rw-r--r--drivers/gpu/drm/gma500/psb_drv.c1
-rw-r--r--drivers/gpu/drm/i810/i810_dma.c1
-rw-r--r--drivers/gpu/drm/i810/i810_drv.c1
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c1
-rw-r--r--drivers/gpu/drm/mga/mga_drv.c1
-rw-r--r--drivers/gpu/drm/mgag200/mgag200_drv.c1
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drm.c1
-rw-r--r--drivers/gpu/drm/omapdrm/omap_drv.c1
-rw-r--r--drivers/gpu/drm/qxl/qxl_drv.c1
-rw-r--r--drivers/gpu/drm/r128/r128_drv.c1
-rw-r--r--drivers/gpu/drm/radeon/radeon_drv.c2
-rw-r--r--drivers/gpu/drm/rcar-du/rcar_du_drv.c1
-rw-r--r--drivers/gpu/drm/savage/savage_drv.c1
-rw-r--r--drivers/gpu/drm/shmobile/shmob_drm_drv.c1
-rw-r--r--drivers/gpu/drm/sis/sis_drv.c1
-rw-r--r--drivers/gpu/drm/tdfx/tdfx_drv.c1
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_drv.c1
-rw-r--r--drivers/gpu/drm/udl/udl_drv.c1
-rw-r--r--drivers/gpu/drm/via/via_drv.c1
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_drv.c1
23 files changed, 0 insertions, 37 deletions
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index a144fb044852..60f1ce3998c3 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -190,7 +190,6 @@ static const struct file_operations ast_fops = {
190 .unlocked_ioctl = drm_ioctl, 190 .unlocked_ioctl = drm_ioctl,
191 .mmap = ast_mmap, 191 .mmap = ast_mmap,
192 .poll = drm_poll, 192 .poll = drm_poll,
193 .fasync = drm_fasync,
194#ifdef CONFIG_COMPAT 193#ifdef CONFIG_COMPAT
195 .compat_ioctl = drm_compat_ioctl, 194 .compat_ioctl = drm_compat_ioctl,
196#endif 195#endif
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c
index d35d99c15f84..dd9c908ab3fc 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c
@@ -85,7 +85,6 @@ static const struct file_operations cirrus_driver_fops = {
85#ifdef CONFIG_COMPAT 85#ifdef CONFIG_COMPAT
86 .compat_ioctl = drm_compat_ioctl, 86 .compat_ioctl = drm_compat_ioctl,
87#endif 87#endif
88 .fasync = drm_fasync,
89}; 88};
90static struct drm_driver driver = { 89static struct drm_driver driver = {
91 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_USE_MTRR, 90 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_USE_MTRR,
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 10334999f229..1817f03efe80 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -73,8 +73,6 @@ static int drm_setup(struct drm_device * dev)
73 dev->last_context = 0; 73 dev->last_context = 0;
74 dev->if_version = 0; 74 dev->if_version = 0;
75 75
76 dev->buf_async = NULL;
77
78 DRM_DEBUG("\n"); 76 DRM_DEBUG("\n");
79 77
80 /* 78 /*
@@ -372,18 +370,6 @@ out_put_pid:
372 return ret; 370 return ret;
373} 371}
374 372
375/** No-op. */
376int drm_fasync(int fd, struct file *filp, int on)
377{
378 struct drm_file *priv = filp->private_data;
379 struct drm_device *dev = priv->minor->dev;
380
381 DRM_DEBUG("fd = %d, device = 0x%lx\n", fd,
382 (long)old_encode_dev(priv->minor->device));
383 return fasync_helper(fd, filp, on, &dev->buf_async);
384}
385EXPORT_SYMBOL(drm_fasync);
386
387static void drm_master_release(struct drm_device *dev, struct file *filp) 373static void drm_master_release(struct drm_device *dev, struct file *filp)
388{ 374{
389 struct drm_file *file_priv = filp->private_data; 375 struct drm_file *file_priv = filp->private_data;
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index d13c2fc848bc..99b5293972c6 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -622,7 +622,6 @@ static const struct file_operations psb_gem_fops = {
622 .unlocked_ioctl = psb_unlocked_ioctl, 622 .unlocked_ioctl = psb_unlocked_ioctl,
623 .mmap = drm_gem_mmap, 623 .mmap = drm_gem_mmap,
624 .poll = drm_poll, 624 .poll = drm_poll,
625 .fasync = drm_fasync,
626 .read = drm_read, 625 .read = drm_read,
627}; 626};
628 627
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index eac755bb8f9b..ab1892eb1074 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -113,7 +113,6 @@ static const struct file_operations i810_buffer_fops = {
113 .release = drm_release, 113 .release = drm_release,
114 .unlocked_ioctl = drm_ioctl, 114 .unlocked_ioctl = drm_ioctl,
115 .mmap = i810_mmap_buffers, 115 .mmap = i810_mmap_buffers,
116 .fasync = drm_fasync,
117#ifdef CONFIG_COMPAT 116#ifdef CONFIG_COMPAT
118 .compat_ioctl = drm_compat_ioctl, 117 .compat_ioctl = drm_compat_ioctl,
119#endif 118#endif
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 2e91fc3580b4..d85c05b4877d 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -49,7 +49,6 @@ static const struct file_operations i810_driver_fops = {
49 .unlocked_ioctl = drm_ioctl, 49 .unlocked_ioctl = drm_ioctl,
50 .mmap = drm_mmap, 50 .mmap = drm_mmap,
51 .poll = drm_poll, 51 .poll = drm_poll,
52 .fasync = drm_fasync,
53#ifdef CONFIG_COMPAT 52#ifdef CONFIG_COMPAT
54 .compat_ioctl = drm_compat_ioctl, 53 .compat_ioctl = drm_compat_ioctl,
55#endif 54#endif
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 13457e3e9cad..9411a745adaf 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -994,7 +994,6 @@ static const struct file_operations i915_driver_fops = {
994 .unlocked_ioctl = drm_ioctl, 994 .unlocked_ioctl = drm_ioctl,
995 .mmap = drm_gem_mmap, 995 .mmap = drm_gem_mmap,
996 .poll = drm_poll, 996 .poll = drm_poll,
997 .fasync = drm_fasync,
998 .read = drm_read, 997 .read = drm_read,
999#ifdef CONFIG_COMPAT 998#ifdef CONFIG_COMPAT
1000 .compat_ioctl = i915_compat_ioctl, 999 .compat_ioctl = i915_compat_ioctl,
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c
index 17d0a637e4fb..fe71e1e44e48 100644
--- a/drivers/gpu/drm/mga/mga_drv.c
+++ b/drivers/gpu/drm/mga/mga_drv.c
@@ -50,7 +50,6 @@ static const struct file_operations mga_driver_fops = {
50 .unlocked_ioctl = drm_ioctl, 50 .unlocked_ioctl = drm_ioctl,
51 .mmap = drm_mmap, 51 .mmap = drm_mmap,
52 .poll = drm_poll, 52 .poll = drm_poll,
53 .fasync = drm_fasync,
54#ifdef CONFIG_COMPAT 53#ifdef CONFIG_COMPAT
55 .compat_ioctl = mga_compat_ioctl, 54 .compat_ioctl = mga_compat_ioctl,
56#endif 55#endif
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index bd9196478735..b570127ae3b2 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -81,7 +81,6 @@ static const struct file_operations mgag200_driver_fops = {
81 .unlocked_ioctl = drm_ioctl, 81 .unlocked_ioctl = drm_ioctl,
82 .mmap = mgag200_mmap, 82 .mmap = mgag200_mmap,
83 .poll = drm_poll, 83 .poll = drm_poll,
84 .fasync = drm_fasync,
85#ifdef CONFIG_COMPAT 84#ifdef CONFIG_COMPAT
86 .compat_ioctl = drm_compat_ioctl, 85 .compat_ioctl = drm_compat_ioctl,
87#endif 86#endif
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 1faa75f42393..b29d04b822ae 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -673,7 +673,6 @@ nouveau_driver_fops = {
673 .unlocked_ioctl = drm_ioctl, 673 .unlocked_ioctl = drm_ioctl,
674 .mmap = nouveau_ttm_mmap, 674 .mmap = nouveau_ttm_mmap,
675 .poll = drm_poll, 675 .poll = drm_poll,
676 .fasync = drm_fasync,
677 .read = drm_read, 676 .read = drm_read,
678#if defined(CONFIG_COMPAT) 677#if defined(CONFIG_COMPAT)
679 .compat_ioctl = nouveau_compat_ioctl, 678 .compat_ioctl = nouveau_compat_ioctl,
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 47e64f916254..2603d909f49c 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -592,7 +592,6 @@ static const struct file_operations omapdriver_fops = {
592 .release = drm_release, 592 .release = drm_release,
593 .mmap = omap_gem_mmap, 593 .mmap = omap_gem_mmap,
594 .poll = drm_poll, 594 .poll = drm_poll,
595 .fasync = drm_fasync,
596 .read = drm_read, 595 .read = drm_read,
597 .llseek = noop_llseek, 596 .llseek = noop_llseek,
598}; 597};
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index 48f2dfdeabcb..514118ae72d4 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -84,7 +84,6 @@ static const struct file_operations qxl_fops = {
84 .release = drm_release, 84 .release = drm_release,
85 .unlocked_ioctl = drm_ioctl, 85 .unlocked_ioctl = drm_ioctl,
86 .poll = drm_poll, 86 .poll = drm_poll,
87 .fasync = drm_fasync,
88 .mmap = qxl_mmap, 87 .mmap = qxl_mmap,
89}; 88};
90 89
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index 472c38fe123f..c2338cbc56ad 100644
--- a/drivers/gpu/drm/r128/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c
@@ -48,7 +48,6 @@ static const struct file_operations r128_driver_fops = {
48 .unlocked_ioctl = drm_ioctl, 48 .unlocked_ioctl = drm_ioctl,
49 .mmap = drm_mmap, 49 .mmap = drm_mmap,
50 .poll = drm_poll, 50 .poll = drm_poll,
51 .fasync = drm_fasync,
52#ifdef CONFIG_COMPAT 51#ifdef CONFIG_COMPAT
53 .compat_ioctl = r128_compat_ioctl, 52 .compat_ioctl = r128_compat_ioctl,
54#endif 53#endif
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 3585f22c5c15..3e52331124de 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -266,7 +266,6 @@ static const struct file_operations radeon_driver_old_fops = {
266 .unlocked_ioctl = drm_ioctl, 266 .unlocked_ioctl = drm_ioctl,
267 .mmap = drm_mmap, 267 .mmap = drm_mmap,
268 .poll = drm_poll, 268 .poll = drm_poll,
269 .fasync = drm_fasync,
270 .read = drm_read, 269 .read = drm_read,
271#ifdef CONFIG_COMPAT 270#ifdef CONFIG_COMPAT
272 .compat_ioctl = radeon_compat_ioctl, 271 .compat_ioctl = radeon_compat_ioctl,
@@ -375,7 +374,6 @@ static const struct file_operations radeon_driver_kms_fops = {
375 .unlocked_ioctl = drm_ioctl, 374 .unlocked_ioctl = drm_ioctl,
376 .mmap = radeon_mmap, 375 .mmap = radeon_mmap,
377 .poll = drm_poll, 376 .poll = drm_poll,
378 .fasync = drm_fasync,
379 .read = drm_read, 377 .read = drm_read,
380#ifdef CONFIG_COMPAT 378#ifdef CONFIG_COMPAT
381 .compat_ioctl = radeon_kms_compat_ioctl, 379 .compat_ioctl = radeon_kms_compat_ioctl,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index 0a9f1bb88337..0023f9719cf1 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -148,7 +148,6 @@ static const struct file_operations rcar_du_fops = {
148#endif 148#endif
149 .poll = drm_poll, 149 .poll = drm_poll,
150 .read = drm_read, 150 .read = drm_read,
151 .fasync = drm_fasync,
152 .llseek = no_llseek, 151 .llseek = no_llseek,
153 .mmap = drm_gem_cma_mmap, 152 .mmap = drm_gem_cma_mmap,
154}; 153};
diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c
index 71b2081e7835..9135c8bd6fbc 100644
--- a/drivers/gpu/drm/savage/savage_drv.c
+++ b/drivers/gpu/drm/savage/savage_drv.c
@@ -42,7 +42,6 @@ static const struct file_operations savage_driver_fops = {
42 .unlocked_ioctl = drm_ioctl, 42 .unlocked_ioctl = drm_ioctl,
43 .mmap = drm_mmap, 43 .mmap = drm_mmap,
44 .poll = drm_poll, 44 .poll = drm_poll,
45 .fasync = drm_fasync,
46#ifdef CONFIG_COMPAT 45#ifdef CONFIG_COMPAT
47 .compat_ioctl = drm_compat_ioctl, 46 .compat_ioctl = drm_compat_ioctl,
48#endif 47#endif
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
index 7f2ea1a5a45f..015551866b4a 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
@@ -257,7 +257,6 @@ static const struct file_operations shmob_drm_fops = {
257#endif 257#endif
258 .poll = drm_poll, 258 .poll = drm_poll,
259 .read = drm_read, 259 .read = drm_read,
260 .fasync = drm_fasync,
261 .llseek = no_llseek, 260 .llseek = no_llseek,
262 .mmap = drm_gem_cma_mmap, 261 .mmap = drm_gem_cma_mmap,
263}; 262};
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 5a5325e6b759..b88b2d302105 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -72,7 +72,6 @@ static const struct file_operations sis_driver_fops = {
72 .unlocked_ioctl = drm_ioctl, 72 .unlocked_ioctl = drm_ioctl,
73 .mmap = drm_mmap, 73 .mmap = drm_mmap,
74 .poll = drm_poll, 74 .poll = drm_poll,
75 .fasync = drm_fasync,
76#ifdef CONFIG_COMPAT 75#ifdef CONFIG_COMPAT
77 .compat_ioctl = drm_compat_ioctl, 76 .compat_ioctl = drm_compat_ioctl,
78#endif 77#endif
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c
index ddfa743459d0..951ec13e4e5c 100644
--- a/drivers/gpu/drm/tdfx/tdfx_drv.c
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.c
@@ -48,7 +48,6 @@ static const struct file_operations tdfx_driver_fops = {
48 .unlocked_ioctl = drm_ioctl, 48 .unlocked_ioctl = drm_ioctl,
49 .mmap = drm_mmap, 49 .mmap = drm_mmap,
50 .poll = drm_poll, 50 .poll = drm_poll,
51 .fasync = drm_fasync,
52#ifdef CONFIG_COMPAT 51#ifdef CONFIG_COMPAT
53 .compat_ioctl = drm_compat_ioctl, 52 .compat_ioctl = drm_compat_ioctl,
54#endif 53#endif
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index 14801c2235ae..116da199b942 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -497,7 +497,6 @@ static const struct file_operations fops = {
497#endif 497#endif
498 .poll = drm_poll, 498 .poll = drm_poll,
499 .read = drm_read, 499 .read = drm_read,
500 .fasync = drm_fasync,
501 .llseek = no_llseek, 500 .llseek = no_llseek,
502 .mmap = drm_gem_cma_mmap, 501 .mmap = drm_gem_cma_mmap,
503}; 502};
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index bb0af58c769a..7650dc0d78ce 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -65,7 +65,6 @@ static const struct file_operations udl_driver_fops = {
65 .read = drm_read, 65 .read = drm_read,
66 .unlocked_ioctl = drm_ioctl, 66 .unlocked_ioctl = drm_ioctl,
67 .release = drm_release, 67 .release = drm_release,
68 .fasync = drm_fasync,
69#ifdef CONFIG_COMPAT 68#ifdef CONFIG_COMPAT
70 .compat_ioctl = drm_compat_ioctl, 69 .compat_ioctl = drm_compat_ioctl,
71#endif 70#endif
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index f4ae20327941..448799968a06 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -64,7 +64,6 @@ static const struct file_operations via_driver_fops = {
64 .unlocked_ioctl = drm_ioctl, 64 .unlocked_ioctl = drm_ioctl,
65 .mmap = drm_mmap, 65 .mmap = drm_mmap,
66 .poll = drm_poll, 66 .poll = drm_poll,
67 .fasync = drm_fasync,
68#ifdef CONFIG_COMPAT 67#ifdef CONFIG_COMPAT
69 .compat_ioctl = drm_compat_ioctl, 68 .compat_ioctl = drm_compat_ioctl,
70#endif 69#endif
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 81ef6bac8737..2dd1919485e4 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -1120,7 +1120,6 @@ static const struct file_operations vmwgfx_driver_fops = {
1120 .mmap = vmw_mmap, 1120 .mmap = vmw_mmap,
1121 .poll = vmw_fops_poll, 1121 .poll = vmw_fops_poll,
1122 .read = vmw_fops_read, 1122 .read = vmw_fops_read,
1123 .fasync = drm_fasync,
1124#if defined(CONFIG_COMPAT) 1123#if defined(CONFIG_COMPAT)
1125 .compat_ioctl = drm_compat_ioctl, 1124 .compat_ioctl = drm_compat_ioctl,
1126#endif 1125#endif