diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-07 17:09:09 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-07 17:09:35 +0200 |
| commit | 4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd (patch) | |
| tree | 33c02b5e18e79756005a3edfa7c862a47de668d5 /drivers/gpu/drm/drm_crtc.c | |
| parent | gma500: mid-bios: rewrite VBT/GCT handling in a cleaner way (diff) | |
| parent | Merge tag 'v3.4-rc6' into drm-intel-next (diff) | |
| download | linux-4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd.tar.xz linux-4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd.zip | |
Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
Daniel prepared this branch with a back-merge as git was getting
very confused about changes in intel_display.c
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 3519b6c174a9..ee63a123235c 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -3376,10 +3376,12 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, ret = crtc->funcs->page_flip(crtc, fb, e); if (ret) { - spin_lock_irqsave(&dev->event_lock, flags); - file_priv->event_space += sizeof e->event; - spin_unlock_irqrestore(&dev->event_lock, flags); - kfree(e); + if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) { + spin_lock_irqsave(&dev->event_lock, flags); + file_priv->event_space += sizeof e->event; + spin_unlock_irqrestore(&dev->event_lock, flags); + kfree(e); + } } out: |