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

Commit 1a0e7918 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: separate vblank and pflip crtc handling 



Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 157fa14d

drivers/gpu/drm/radeon/cik.c

+6 −6
Original line number Diff line number Diff line
@@ -7314,7 +7314,7 @@ int cik_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[0]))

						radeon_crtc_handle_flip(rdev, 0);

						radeon_crtc_handle_vblank(rdev, 0);

					rdev->irq.stat_regs.cik.disp_int &= ~LB_D1_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D1 vblank\n");

				}
@@ -7340,7 +7340,7 @@ int cik_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[1]))

						radeon_crtc_handle_flip(rdev, 1);

						radeon_crtc_handle_vblank(rdev, 1);

					rdev->irq.stat_regs.cik.disp_int_cont &= ~LB_D2_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D2 vblank\n");

				}
@@ -7366,7 +7366,7 @@ int cik_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[2]))

						radeon_crtc_handle_flip(rdev, 2);

						radeon_crtc_handle_vblank(rdev, 2);

					rdev->irq.stat_regs.cik.disp_int_cont2 &= ~LB_D3_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D3 vblank\n");

				}
@@ -7392,7 +7392,7 @@ int cik_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[3]))

						radeon_crtc_handle_flip(rdev, 3);

						radeon_crtc_handle_vblank(rdev, 3);

					rdev->irq.stat_regs.cik.disp_int_cont3 &= ~LB_D4_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D4 vblank\n");

				}
@@ -7418,7 +7418,7 @@ int cik_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[4]))

						radeon_crtc_handle_flip(rdev, 4);

						radeon_crtc_handle_vblank(rdev, 4);

					rdev->irq.stat_regs.cik.disp_int_cont4 &= ~LB_D5_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D5 vblank\n");

				}
@@ -7444,7 +7444,7 @@ int cik_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[5]))

						radeon_crtc_handle_flip(rdev, 5);

						radeon_crtc_handle_vblank(rdev, 5);

					rdev->irq.stat_regs.cik.disp_int_cont5 &= ~LB_D6_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D6 vblank\n");

				}

drivers/gpu/drm/radeon/evergreen.c

+6 −6
Original line number Diff line number Diff line
@@ -4789,7 +4789,7 @@ int evergreen_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[0]))

						radeon_crtc_handle_flip(rdev, 0);

						radeon_crtc_handle_vblank(rdev, 0);

					rdev->irq.stat_regs.evergreen.disp_int &= ~LB_D1_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D1 vblank\n");

				}
@@ -4815,7 +4815,7 @@ int evergreen_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[1]))

						radeon_crtc_handle_flip(rdev, 1);

						radeon_crtc_handle_vblank(rdev, 1);

					rdev->irq.stat_regs.evergreen.disp_int_cont &= ~LB_D2_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D2 vblank\n");

				}
@@ -4841,7 +4841,7 @@ int evergreen_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[2]))

						radeon_crtc_handle_flip(rdev, 2);

						radeon_crtc_handle_vblank(rdev, 2);

					rdev->irq.stat_regs.evergreen.disp_int_cont2 &= ~LB_D3_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D3 vblank\n");

				}
@@ -4867,7 +4867,7 @@ int evergreen_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[3]))

						radeon_crtc_handle_flip(rdev, 3);

						radeon_crtc_handle_vblank(rdev, 3);

					rdev->irq.stat_regs.evergreen.disp_int_cont3 &= ~LB_D4_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D4 vblank\n");

				}
@@ -4893,7 +4893,7 @@ int evergreen_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[4]))

						radeon_crtc_handle_flip(rdev, 4);

						radeon_crtc_handle_vblank(rdev, 4);

					rdev->irq.stat_regs.evergreen.disp_int_cont4 &= ~LB_D5_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D5 vblank\n");

				}
@@ -4919,7 +4919,7 @@ int evergreen_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[5]))

						radeon_crtc_handle_flip(rdev, 5);

						radeon_crtc_handle_vblank(rdev, 5);

					rdev->irq.stat_regs.evergreen.disp_int_cont5 &= ~LB_D6_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D6 vblank\n");

				}

drivers/gpu/drm/radeon/r100.c

+2 −2
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ int r100_irq_process(struct radeon_device *rdev) 
				wake_up(&rdev->irq.vblank_queue);

			}

			if (atomic_read(&rdev->irq.pflip[0]))

				radeon_crtc_handle_flip(rdev, 0);

				radeon_crtc_handle_vblank(rdev, 0);

		}

		if (status & RADEON_CRTC2_VBLANK_STAT) {

			if (rdev->irq.crtc_vblank_int[1]) {
@@ -788,7 +788,7 @@ int r100_irq_process(struct radeon_device *rdev) 
				wake_up(&rdev->irq.vblank_queue);

			}

			if (atomic_read(&rdev->irq.pflip[1]))

				radeon_crtc_handle_flip(rdev, 1);

				radeon_crtc_handle_vblank(rdev, 1);

		}

		if (status & RADEON_FP_DETECT_STAT) {

			queue_hotplug = true;

drivers/gpu/drm/radeon/r600.c

+2 −2
Original line number Diff line number Diff line
@@ -3876,7 +3876,7 @@ int r600_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[0]))

						radeon_crtc_handle_flip(rdev, 0);

						radeon_crtc_handle_vblank(rdev, 0);

					rdev->irq.stat_regs.r600.disp_int &= ~LB_D1_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D1 vblank\n");

				}
@@ -3902,7 +3902,7 @@ int r600_irq_process(struct radeon_device *rdev) 
						wake_up(&rdev->irq.vblank_queue);

					}

					if (atomic_read(&rdev->irq.pflip[1]))

						radeon_crtc_handle_flip(rdev, 1);

						radeon_crtc_handle_vblank(rdev, 1);

					rdev->irq.stat_regs.r600.disp_int &= ~LB_D2_VBLANK_INTERRUPT;

					DRM_DEBUG("IH: D2 vblank\n");

				}

drivers/gpu/drm/radeon/radeon_display.c

+31 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void radeon_unpin_work_func(struct work_struct *__work) 
	kfree(work);

}



void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)

void radeon_crtc_handle_vblank(struct radeon_device *rdev, int crtc_id)

{

	struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id];

	struct radeon_unpin_work *work;
@@ -302,7 +302,6 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id) 
		 * completion routine.

		 */

		update_pending = 0;

		radeon_crtc->deferred_flip_completion = 0;

	}



	/* Has the pageflip already completed in crtc, or is it certain
@@ -330,10 +329,40 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id) 
		radeon_crtc->deferred_flip_completion = 1;

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

		return;

	} else {

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

		radeon_crtc_handle_flip(rdev, crtc_id);

	}

}



/**

 * radeon_crtc_handle_flip - page flip completed

 *

 * @rdev: radeon device pointer

 * @crtc_id: crtc number this event is for

 *

 * Called when we are sure that a page flip for this crtc is completed.

 */

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;

	unsigned long flags;



	/* this can happen at init */

	if (radeon_crtc == NULL)

		return;



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

	work = radeon_crtc->unpin_work;

	if (work == NULL) {

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

		return;

	}



	/* Pageflip (will be) certainly completed in this vblank. Clean up. */

	radeon_crtc->unpin_work = NULL;

	radeon_crtc->deferred_flip_completion = 0;



	/* wakeup userspace */

	if (work->event)