From: Mario Kleiner <mario.klei...@tuebingen.mpg.de>
In the vblank irq handler, calls to actual vblank handling,
or at least drm_handle_vblank(), need to happen before
calls to radeon_crtc_handle_flip().
Reason: The high precision pageflip timestamping
and some other pageflip optimizations will need the updated
vblank count and timestamps for the current vblank interval.
These are calculated in drm_handle_vblank(), therefore it
must go first.
Signed-off-by: Mario Kleiner <mario.klei...@tuebingen.mpg.de>
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
---
drivers/gpu/drm/radeon/evergreen.c | 8 ++++----
drivers/gpu/drm/radeon/r100.c | 8 ++++----
drivers/gpu/drm/radeon/r600.c | 8 ++++----
drivers/gpu/drm/radeon/rs600.c | 8 ++++----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/radeon/evergreen.c
b/drivers/gpu/drm/radeon/evergreen.c
index df3f372..25e8437 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -2398,13 +2398,13 @@ restart_ih:
switch (src_data) {
case 0: /* D1 vblank */
if (rdev->irq.stat_regs.evergreen.disp_int &
LB_D1_VBLANK_INTERRUPT) {
- if (rdev->irq.pflip[0])
- radeon_crtc_handle_flip(rdev,
0);
if (rdev->irq.crtc_vblank_int[0]) {
drm_handle_vblank(rdev->ddev,
0);
rdev->pm.vblank_sync = true;
wake_up(&rdev->irq.vblank_queue);
}
+ if (rdev->irq.pflip[0])
+ radeon_crtc_handle_flip(rdev,
0);
rdev->irq.stat_regs.evergreen.disp_int
&= ~LB_D1_VBLANK_INTERRUPT;
DRM_DEBUG("IH: D1 vblank\n");
}
@@ -2424,13 +2424,13 @@ restart_ih:
switch (src_data) {
case 0: /* D2 vblank */
if (rdev->irq.stat_regs.evergreen.disp_int_cont
& LB_D2_VBLANK_INTERRUPT) {
- if (rdev->irq.pflip[1])
- radeon_crtc_handle_flip(rdev,
1);
if (rdev->irq.crtc_vblank_int[1]) {
drm_handle_vblank(rdev->ddev,
1);
rdev->pm.vblank_sync = true;
wake_up(&rdev->irq.vblank_queue);
}
+ if (rdev->irq.pflip[1])
+ radeon_crtc_handle_flip(rdev,
1);
rdev->irq.stat_regs.evergreen.disp_int_cont &= ~LB_D2_VBLANK_INTERRUPT;
DRM_DEBUG("IH: D2 vblank\n");
}
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index b2e2979..2316f73 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -650,22 +650,22 @@ int r100_irq_process(struct radeon_device *rdev)
}
/* Vertical blank interrupts */
if (status & RADEON_CRTC_VBLANK_STAT) {
- if (rdev->irq.pflip[0])
- radeon_crtc_handle_flip(rdev, 0);
if (rdev->irq.crtc_vblank_int[0]) {
drm_handle_vblank(rdev->ddev, 0);
rdev->pm.vblank_sync = true;
wake_up(&rdev->irq.vblank_queue);
}
+ if (rdev->irq.pflip[0])
+ radeon_crtc_handle_flip(rdev, 0);
}
if (status & RADEON_CRTC2_VBLANK_STAT) {
- if (rdev->irq.pflip[1])
- radeon_crtc_handle_flip(rdev, 1);
if (rdev->irq.crtc_vblank_int[1]) {
drm_handle_vblank(rdev->ddev, 1);
rdev->pm.vblank_sync = true;
wake_up(&rdev->irq.vblank_queue);
}
+ if (rdev->irq.pflip[1])
+ radeon_crtc_handle_flip(rdev, 1);
}
if (status & RADEON_FP_DETECT_STAT) {
queue_hotplug = true;
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 15b9572..7057b39 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -3294,13 +3294,13 @@ restart_ih:
switch (src_data) {
case 0: /* D1 vblank */
if (rdev->irq.stat_regs.r600.disp_int &
LB_D1_VBLANK_INTERRUPT) {
- if (rdev->irq.pflip[0])
- radeon_crtc_handle_flip(rdev,
0);
if (rdev->irq.crtc_vblank_int[0]) {
drm_handle_vblank(rdev->ddev,
0);
rdev->pm.vblank_sync = true;
wake_up(&rdev->irq.vblank_queue);
}
+ if (rdev->irq.pflip[0])
+ radeon_crtc_handle_flip(rdev,
0);
rdev->irq.stat_regs.r600.disp_int &=
~LB_D1_VBLANK_INTERRUPT;
DRM_DEBUG("IH: D1 vblank\n");
}
@@ -3320,13 +3320,13 @@ restart_ih:
switch (src_data) {
case 0: /* D2 vblank */
if (rdev->irq.stat_regs.r600.disp_int &
LB_D2_VBLANK_INTERRUPT) {
- if (rdev->irq.pflip[1])
- radeon_crtc_handle_flip(rdev,
1);
if (rdev->irq.crtc_vblank_int[1]) {
drm_handle_vblank(rdev->ddev,
1);
rdev->pm.vblank_sync = true;
wake_up(&rdev->irq.vblank_queue);
}
+ if (rdev->irq.pflip[1])
+ radeon_crtc_handle_flip(rdev,
1);
rdev->irq.stat_regs.r600.disp_int &=
~LB_D2_VBLANK_INTERRUPT;
DRM_DEBUG("IH: D2 vblank\n");
}
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 683652b..9a85b16 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -662,22 +662,22 @@ int rs600_irq_process(struct radeon_device *rdev)
}
/* Vertical blank interrupts */
if
(G_007EDC_LB_D1_VBLANK_INTERRUPT(rdev->irq.stat_regs.r500.disp_int)) {
- if (rdev->irq.pflip[0])
- radeon_crtc_handle_flip(rdev, 0);
if (rdev->irq.crtc_vblank_int[0]) {
drm_handle_vblank(rdev->ddev, 0);
rdev->pm.vblank_sync = true;
wake_up(&rdev->irq.vblank_queue);
}
+ if (rdev->irq.pflip[0])
+ radeon_crtc_handle_flip(rdev, 0);
}
if
(G_007EDC_LB_D2_VBLANK_INTERRUPT(rdev->irq.stat_regs.r500.disp_int)) {
- if (rdev->irq.pflip[1])
- radeon_crtc_handle_flip(rdev, 1);
if (rdev->irq.crtc_vblank_int[1]) {
drm_handle_vblank(rdev->ddev, 1);
rdev->pm.vblank_sync = true;
wake_up(&rdev->irq.vblank_queue);
}
+ if (rdev->irq.pflip[1])
+ radeon_crtc_handle_flip(rdev, 1);
}
if
(G_007EDC_DC_HOT_PLUG_DETECT1_INTERRUPT(rdev->irq.stat_regs.r500.disp_int)) {
queue_hotplug = true;
--
1.7.1.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
