diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-09-29 17:47:58 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-09-30 12:45:09 +1000 |
| commit | 130b9851933e6da636502cd85e1ba8f45f862e8c (patch) | |
| tree | c08b7977b210bfd2974b5ce94f47c2d0854a11b9 | |
| parent | f36fce0f49ed40f3e843d45fa53d476d63444b58 (diff) | |
| download | op-kernel-dev-130b9851933e6da636502cd85e1ba8f45f862e8c.zip op-kernel-dev-130b9851933e6da636502cd85e1ba8f45f862e8c.tar.gz | |
drm: i810/i830: fix locked ioctl variant
The i810 and i830 device drivers may replace their file operations
on an open file descriptor. My previous patch to move the BKL
out of the common DRM code into these drivers only caught the
default file operations, not the ones that actually end up being
used.
Found while trying to come up with a way to kill the BKL for
good in these drivers.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/i810/i810_dma.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i830/i830_dma.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index 61b4caf..fb07e73 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c @@ -116,7 +116,7 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) static const struct file_operations i810_buffer_fops = { .open = drm_open, .release = drm_release, - .unlocked_ioctl = drm_ioctl, + .unlocked_ioctl = i810_ioctl, .mmap = i810_mmap_buffers, .fasync = drm_fasync, }; diff --git a/drivers/gpu/drm/i830/i830_dma.c b/drivers/gpu/drm/i830/i830_dma.c index 671aa18..cc92c7e 100644 --- a/drivers/gpu/drm/i830/i830_dma.c +++ b/drivers/gpu/drm/i830/i830_dma.c @@ -118,7 +118,7 @@ static int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma) static const struct file_operations i830_buffer_fops = { .open = drm_open, .release = drm_release, - .unlocked_ioctl = drm_ioctl, + .unlocked_ioctl = i830_ioctl, .mmap = i830_mmap_buffers, .fasync = drm_fasync, }; |
