diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2011-10-10 12:23:27 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-10-10 15:47:19 +0100 |
| commit | 5438ae88d098c086cfb94be5327c49a04fc6bfd7 (patch) | |
| tree | 7ab7c17c9efe7b4c7f1dd02b45fed4296ef19ced /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
| parent | 57c5ee79acba9582762c09c269e0e2ae1adf1b31 (diff) | |
vmwgfx: Wrap drm_read and drm_poll
Make sure the device is processing the fifo when these functions are
called in case they might sleep waiting for an event.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 5e1994a8ffc..e07dcf40a3b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1085,7 +1085,8 @@ static struct drm_driver driver = { .release = drm_release, .unlocked_ioctl = vmw_unlocked_ioctl, .mmap = vmw_mmap, - .poll = drm_poll, + .poll = vmw_fops_poll, + .read = vmw_fops_read, .fasync = drm_fasync, #if defined(CONFIG_COMPAT) .compat_ioctl = drm_compat_ioctl, |