diff options
| author | Eric Anholt <eric@anholt.net> | 2007-09-03 04:06:45 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@optimus.(none)> | 2007-10-15 02:38:20 +0200 |
| commit | c153f45f9b7e30289157bba3ff5682291df16caa (patch) | |
| tree | 33f21e1ebd83ec548751f3d490afe6230ab99972 /drivers/char/drm/drm_fops.c | |
| parent | drm: remove XFREE86_VERSION macros. (diff) | |
| download | linux-c153f45f9b7e30289157bba3ff5682291df16caa.tar.xz linux-c153f45f9b7e30289157bba3ff5682291df16caa.zip | |
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_fops.c')
| -rw-r--r-- | drivers/char/drm/drm_fops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c index 1100c51aa4d6..f383fc37190c 100644 --- a/drivers/char/drm/drm_fops.c +++ b/drivers/char/drm/drm_fops.c @@ -343,7 +343,7 @@ int drm_release(struct inode *inode, struct file *filp) dev->open_count); if (dev->driver->reclaim_buffers_locked && dev->lock.hw_lock) { - if (drm_i_have_hw_lock(file_priv)) { + if (drm_i_have_hw_lock(dev, file_priv)) { dev->driver->reclaim_buffers_locked(dev, file_priv); } else { unsigned long _end=jiffies + 3*DRM_HZ; @@ -383,7 +383,7 @@ int drm_release(struct inode *inode, struct file *filp) } - if (drm_i_have_hw_lock(file_priv)) { + if (drm_i_have_hw_lock(dev, file_priv)) { DRM_DEBUG("File %p released, freeing lock for context %d\n", filp, _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock)); |