xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next

Browse Source 
Daniel prepared this branch with a back-merge as git was getting
very confused about changes in intel_display.c
This commit is contained in:
Dave Airlie
2012-05-07 16:09:09 +01:00
parent 4086b1e2b1 dc257cf154
commit 4f256e8aa3
687 changed files with 6559 additions and 4098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/drm_crtc.c
View File

@@ -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: