Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 685d54b3 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/radeon: Move fb update from radeon_flip_work_func to radeon_crtc_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: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8a309113

drivers/gpu/drm/radeon/radeon_display.c

+3 −3
Original line number Diff line number Diff line
@@ -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);
@@ -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);