Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 376363
b: refs/heads/master
c: 26ae466
h: refs/heads/master
i:
  376361: 5b84c22
  376359: 9cfc29a
v: v3
  • Loading branch information
Rob Clark authored and Dave Airlie committed May 21, 2013
1 parent 0584060 commit 765cdf6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 95d38d144ab4520aea3f8fcfacc5fd62d3bf2697
refs/heads/master: 26ae466732c181b7376610fd9241787698179b01
13 changes: 3 additions & 10 deletions trunk/drivers/gpu/drm/radeon/radeon_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,6 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
{
struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id];
struct radeon_unpin_work *work;
struct drm_pending_vblank_event *e;
struct timeval now;
unsigned long flags;
u32 update_pending;
int vpos, hpos;
Expand Down Expand Up @@ -328,14 +326,9 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
radeon_crtc->unpin_work = NULL;

/* wakeup userspace */
if (work->event) {
e = work->event;
e->event.sequence = drm_vblank_count_and_time(rdev->ddev, crtc_id, &now);
e->event.tv_sec = now.tv_sec;
e->event.tv_usec = now.tv_usec;
list_add_tail(&e->base.link, &e->base.file_priv->event_list);
wake_up_interruptible(&e->base.file_priv->event_wait);
}
if (work->event)
drm_send_vblank_event(rdev->ddev, crtc_id, work->event);

spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);

drm_vblank_put(rdev->ddev, radeon_crtc->crtc_id);
Expand Down

0 comments on commit 765cdf6

Please sign in to comment.