diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2012-04-18 13:47:02 +0900 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-19 14:36:51 +0100 |
| commit | aef6a7eeac6fd867eda415f65a7f0247fb82baf4 (patch) | |
| tree | af52dcf49550f4791e02296e49af1f0c6ca15536 /drivers | |
| parent | d6b8395262a9d90e4ab11b614a5fb8f858e2b3df (diff) | |
| download | linux-stable-aef6a7eeac6fd867eda415f65a7f0247fb82baf4.tar.gz linux-stable-aef6a7eeac6fd867eda415f65a7f0247fb82baf4.tar.bz2 linux-stable-aef6a7eeac6fd867eda415f65a7f0247fb82baf4.zip | |
drm: fix page_flip error handling
Free event and restore event_space only when page_flip->flags has
DRM_MODE_PAGE_FLIP_EVENT if page_flip() is failed.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -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 d3aaeb6ae236..c79870a75c2f 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -3335,10 +3335,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: |