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

Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next

Browse Source
This commit is contained in:
Dave Airlie
2011-01-05 08:31:08 +10:00
parent 204663c487 989d873fc5
commit 4f125010d2
656 changed files with 6383 additions and 4644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/drm_irq.c
View File

@@ -1091,7 +1091,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
e->event.sequence = seq;
e->event.tv_sec = now.tv_sec;
e->event.tv_usec = now.tv_usec;
drm_vblank_put(dev, e->pipe);
drm_vblank_put(dev, pipe);
list_add_tail(&e->base.link, &e->base.file_priv->event_list);
wake_up_interruptible(&e->base.file_priv->event_wait);
vblwait->reply.sequence = seq;
@@ -1110,7 +1110,7 @@ err_unlock:
spin_unlock_irqrestore(&dev->event_lock, flags);
kfree(e);
err_put:
drm_vblank_put(dev, e->pipe);
drm_vblank_put(dev, pipe);
return ret;
}