diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-23 11:59:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-23 11:59:32 -0500 |
| commit | f42ecb2808db5386f983d593a7c08d3ea3b94a27 (patch) | |
| tree | 3b5584f4e5e73f5f01807e5176cbe29e1db69868 /drivers/gpu/drm/i915 | |
| parent | 119eecc831a42bd090543568932e440c6831f1bb (diff) | |
| parent | d94a5108f716bbd524358eb5a440d63991744a62 (diff) | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (35 commits)
drm/radeon/kms: add definitions for v4 power tables
drm/radeon/kms: never combine LVDS with another encoder
drm/radeon/kms: Check module arguments to be valid V2
drm/radeon/kms: Avoid crash when trying to cleanup uninitialized structure
drm/radeon/kms: add cvt mode if we only have lvds w/h and no edid (v4)
drm/radeon/kms: add 3DC compression support
drm/radeon/kms: allow rendering while no colorbuffer is set on r300
drm/radeon/kms: enable memory clock reading on legacy (V2)
drm/radeon/kms: prevent parallel AtomBIOS calls
drm/radeon/kms: set proper default tv standard
drm/radeon/kms: fix legacy rmx
drm/radeon/kms/atom: fill in proper defines for digital setup
drm/kms: silencing a false positive warning.
drm/mm: fix logic for selection of best fit block
drm/vmwgfx: Use TTM handles instead of SIDs as user-space surface handles.
drm/vmwgfx: Return -ERESTARTSYS when interrupted by a signal.
drm/vmwgfx: Fix unlocked ioctl and add proper access control
drm/radeon: fix build on 64-bit with some compilers.
drivers/gpu: Use kzalloc for allocating only one thing
DRM: Rename clamp variable
...
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_ioc32.c | 23 |
2 files changed, 11 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 2fa217862058..24286ca168fc 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
| @@ -329,7 +329,7 @@ static struct drm_driver driver = { | |||
| 329 | .owner = THIS_MODULE, | 329 | .owner = THIS_MODULE, |
| 330 | .open = drm_open, | 330 | .open = drm_open, |
| 331 | .release = drm_release, | 331 | .release = drm_release, |
| 332 | .ioctl = drm_ioctl, | 332 | .unlocked_ioctl = drm_ioctl, |
| 333 | .mmap = drm_gem_mmap, | 333 | .mmap = drm_gem_mmap, |
| 334 | .poll = drm_poll, | 334 | .poll = drm_poll, |
| 335 | .fasync = drm_fasync, | 335 | .fasync = drm_fasync, |
diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c index 1fe68a251b75..13b028994b2b 100644 --- a/drivers/gpu/drm/i915/i915_ioc32.c +++ b/drivers/gpu/drm/i915/i915_ioc32.c | |||
| @@ -66,8 +66,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd, | |||
| 66 | &batchbuffer->cliprects)) | 66 | &batchbuffer->cliprects)) |
| 67 | return -EFAULT; | 67 | return -EFAULT; |
| 68 | 68 | ||
| 69 | return drm_ioctl(file->f_path.dentry->d_inode, file, | 69 | return drm_ioctl(file, DRM_IOCTL_I915_BATCHBUFFER, |
| 70 | DRM_IOCTL_I915_BATCHBUFFER, | ||
| 71 | (unsigned long)batchbuffer); | 70 | (unsigned long)batchbuffer); |
| 72 | } | 71 | } |
| 73 | 72 | ||
| @@ -102,8 +101,8 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd, | |||
| 102 | &cmdbuffer->cliprects)) | 101 | &cmdbuffer->cliprects)) |
| 103 | return -EFAULT; | 102 | return -EFAULT; |
| 104 | 103 | ||
| 105 | return drm_ioctl(file->f_path.dentry->d_inode, file, | 104 | return drm_ioctl(file, DRM_IOCTL_I915_CMDBUFFER, |
| 106 | DRM_IOCTL_I915_CMDBUFFER, (unsigned long)cmdbuffer); | 105 | (unsigned long)cmdbuffer); |
| 107 | } | 106 | } |
| 108 | 107 | ||
| 109 | typedef struct drm_i915_irq_emit32 { | 108 | typedef struct drm_i915_irq_emit32 { |
| @@ -125,8 +124,8 @@ static int compat_i915_irq_emit(struct file *file, unsigned int cmd, | |||
| 125 | &request->irq_seq)) | 124 | &request->irq_seq)) |
| 126 | return -EFAULT; | 125 | return -EFAULT; |
| 127 | 126 | ||
| 128 | return drm_ioctl(file->f_path.dentry->d_inode, file, | 127 | return drm_ioctl(file, DRM_IOCTL_I915_IRQ_EMIT, |
| 129 | DRM_IOCTL_I915_IRQ_EMIT, (unsigned long)request); | 128 | (unsigned long)request); |
| 130 | } | 129 | } |
| 131 | typedef struct drm_i915_getparam32 { | 130 | typedef struct drm_i915_getparam32 { |
| 132 | int param; | 131 | int param; |
| @@ -149,8 +148,8 @@ static int compat_i915_getparam(struct file *file, unsigned int cmd, | |||
| 149 | &request->value)) | 148 | &request->value)) |
| 150 | return -EFAULT; | 149 | return -EFAULT; |
| 151 | 150 | ||
| 152 | return drm_ioctl(file->f_path.dentry->d_inode, file, | 151 | return drm_ioctl(file, DRM_IOCTL_I915_GETPARAM, |
| 153 | DRM_IOCTL_I915_GETPARAM, (unsigned long)request); | 152 | (unsigned long)request); |
| 154 | } | 153 | } |
| 155 | 154 | ||
| 156 | typedef struct drm_i915_mem_alloc32 { | 155 | typedef struct drm_i915_mem_alloc32 { |
| @@ -178,8 +177,8 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd, | |||
| 178 | &request->region_offset)) | 177 | &request->region_offset)) |
| 179 | return -EFAULT; | 178 | return -EFAULT; |
| 180 | 179 | ||
| 181 | return drm_ioctl(file->f_path.dentry->d_inode, file, | 180 | return drm_ioctl(file, DRM_IOCTL_I915_ALLOC, |
| 182 | DRM_IOCTL_I915_ALLOC, (unsigned long)request); | 181 | (unsigned long)request); |
| 183 | } | 182 | } |
| 184 | 183 | ||
| 185 | drm_ioctl_compat_t *i915_compat_ioctls[] = { | 184 | drm_ioctl_compat_t *i915_compat_ioctls[] = { |
| @@ -211,12 +210,10 @@ long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
| 211 | if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) | 210 | if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) |
| 212 | fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE]; | 211 | fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE]; |
| 213 | 212 | ||
| 214 | lock_kernel(); /* XXX for now */ | ||
| 215 | if (fn != NULL) | 213 | if (fn != NULL) |
| 216 | ret = (*fn) (filp, cmd, arg); | 214 | ret = (*fn) (filp, cmd, arg); |
| 217 | else | 215 | else |
| 218 | ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg); | 216 | ret = drm_ioctl(filp, cmd, arg); |
| 219 | unlock_kernel(); | ||
| 220 | 217 | ||
| 221 | return ret; | 218 | return ret; |
| 222 | } | 219 | } |