Skip to content

Commit

Permalink
drm/radeon: Move fb update from radeon_flip_work_func to radeon_crtc_…
Browse files Browse the repository at this point in the history
…page_flip

Fixes WARN()s from the DRM core since the page flip rework.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=77521
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Michel Dänzer authored and Alex Deucher committed Jun 10, 2014
1 parent 8a30911 commit 685d54b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/radeon/radeon_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,9 +462,6 @@ static void radeon_flip_work_func(struct work_struct *__work)
/* We borrow the event spin lock for protecting flip_work */
spin_lock_irqsave(&crtc->dev->event_lock, flags);

/* update crtc fb */
crtc->primary->fb = fb;

/* set the proper interrupt */
radeon_irq_kms_pflip_irq_get(rdev, radeon_crtc->crtc_id);

Expand Down Expand Up @@ -539,6 +536,9 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
}
radeon_crtc->flip_work = work;

/* update crtc fb */
crtc->primary->fb = fb;

spin_unlock_irqrestore(&crtc->dev->event_lock, flags);

queue_work(radeon_crtc->flip_queue, &work->flip_work);
Expand Down

0 comments on commit 685d54b

Please sign in to comment.