aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drm_os_linux.h
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-09-02 22:06:45 -0400
committerDave Airlie <airlied@optimus.(none)>2007-10-14 20:38:20 -0400
commitc153f45f9b7e30289157bba3ff5682291df16caa (patch)
tree33f21e1ebd83ec548751f3d490afe6230ab99972 /drivers/char/drm/drm_os_linux.h
parentb589ee5943a9610ebaea6e4e3433f2ae4d812b0b (diff)
drm: Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE.
The data is now in kernel space, copied in/out as appropriate according to t This results in DRM_COPY_{TO,FROM}_USER going away, and error paths to deal with those failures. This also means that XFree86 4.2.0 support for i810 DR is lost. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_os_linux.h')
-rw-r--r--drivers/char/drm/drm_os_linux.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h
index e87dc34a6fb..114e54e0f61 100644
--- a/drivers/char/drm/drm_os_linux.h
+++ b/drivers/char/drm/drm_os_linux.h
@@ -6,8 +6,6 @@
6#include <linux/interrupt.h> /* For task queue support */ 6#include <linux/interrupt.h> /* For task queue support */
7#include <linux/delay.h> 7#include <linux/delay.h>
8 8
9/** Ioctl arguments */
10#define DRM_IOCTL_ARGS struct inode *inode, struct drm_file *file_priv, unsigned int cmd, unsigned long data
11/** Current process ID */ 9/** Current process ID */
12#define DRM_CURRENTPID current->pid 10#define DRM_CURRENTPID current->pid
13#define DRM_SUSER(p) capable(CAP_SYS_ADMIN) 11#define DRM_SUSER(p) capable(CAP_SYS_ADMIN)
@@ -30,8 +28,6 @@
30#define DRM_WRITEMEMORYBARRIER() wmb() 28#define DRM_WRITEMEMORYBARRIER() wmb()
31/** Read/write memory barrier */ 29/** Read/write memory barrier */
32#define DRM_MEMORYBARRIER() mb() 30#define DRM_MEMORYBARRIER() mb()
33/** DRM device local declaration */
34#define DRM_DEVICE struct drm_device *dev = file_priv->head->dev
35 31
36/** IRQ handler arguments and return type and values */ 32/** IRQ handler arguments and return type and values */
37#define DRM_IRQ_ARGS int irq, void *arg 33#define DRM_IRQ_ARGS int irq, void *arg