diff options
author | Mario Kleiner <mario.kleiner@tuebingen.mpg.de> | 2010-11-21 10:59:02 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-11-21 20:51:27 -0500 |
commit | 3e4ea7421f45966c93c8cbe81569e8dc93a58b87 (patch) | |
tree | 9a27cb7455aeed88a1ccaa0ec6d234b606c480f6 /drivers/gpu/drm/radeon/evergreen.c | |
parent | 6f34be50bd1bdd2ff3c955940e033a80d05f248a (diff) |
drm/kms/radeon: Reorder vblank and pageflip interrupt handling.
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.kleiner@tuebingen.mpg.de>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
-rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index df3f3724322..25e84379e7c 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -2398,13 +2398,13 @@ restart_ih: | |||
2398 | switch (src_data) { | 2398 | switch (src_data) { |
2399 | case 0: /* D1 vblank */ | 2399 | case 0: /* D1 vblank */ |
2400 | if (rdev->irq.stat_regs.evergreen.disp_int & LB_D1_VBLANK_INTERRUPT) { | 2400 | if (rdev->irq.stat_regs.evergreen.disp_int & LB_D1_VBLANK_INTERRUPT) { |
2401 | if (rdev->irq.pflip[0]) | ||
2402 | radeon_crtc_handle_flip(rdev, 0); | ||
2403 | if (rdev->irq.crtc_vblank_int[0]) { | 2401 | if (rdev->irq.crtc_vblank_int[0]) { |
2404 | drm_handle_vblank(rdev->ddev, 0); | 2402 | drm_handle_vblank(rdev->ddev, 0); |
2405 | rdev->pm.vblank_sync = true; | 2403 | rdev->pm.vblank_sync = true; |
2406 | wake_up(&rdev->irq.vblank_queue); | 2404 | wake_up(&rdev->irq.vblank_queue); |
2407 | } | 2405 | } |
2406 | if (rdev->irq.pflip[0]) | ||
2407 | radeon_crtc_handle_flip(rdev, 0); | ||
2408 | rdev->irq.stat_regs.evergreen.disp_int &= ~LB_D1_VBLANK_INTERRUPT; | 2408 | rdev->irq.stat_regs.evergreen.disp_int &= ~LB_D1_VBLANK_INTERRUPT; |
2409 | DRM_DEBUG("IH: D1 vblank\n"); | 2409 | DRM_DEBUG("IH: D1 vblank\n"); |
2410 | } | 2410 | } |
@@ -2424,13 +2424,13 @@ restart_ih: | |||
2424 | switch (src_data) { | 2424 | switch (src_data) { |
2425 | case 0: /* D2 vblank */ | 2425 | case 0: /* D2 vblank */ |
2426 | if (rdev->irq.stat_regs.evergreen.disp_int_cont & LB_D2_VBLANK_INTERRUPT) { | 2426 | if (rdev->irq.stat_regs.evergreen.disp_int_cont & LB_D2_VBLANK_INTERRUPT) { |
2427 | if (rdev->irq.pflip[1]) | ||
2428 | radeon_crtc_handle_flip(rdev, 1); | ||
2429 | if (rdev->irq.crtc_vblank_int[1]) { | 2427 | if (rdev->irq.crtc_vblank_int[1]) { |
2430 | drm_handle_vblank(rdev->ddev, 1); | 2428 | drm_handle_vblank(rdev->ddev, 1); |
2431 | rdev->pm.vblank_sync = true; | 2429 | rdev->pm.vblank_sync = true; |
2432 | wake_up(&rdev->irq.vblank_queue); | 2430 | wake_up(&rdev->irq.vblank_queue); |
2433 | } | 2431 | } |
2432 | if (rdev->irq.pflip[1]) | ||
2433 | radeon_crtc_handle_flip(rdev, 1); | ||
2434 | rdev->irq.stat_regs.evergreen.disp_int_cont &= ~LB_D2_VBLANK_INTERRUPT; | 2434 | rdev->irq.stat_regs.evergreen.disp_int_cont &= ~LB_D2_VBLANK_INTERRUPT; |
2435 | DRM_DEBUG("IH: D2 vblank\n"); | 2435 | DRM_DEBUG("IH: D2 vblank\n"); |
2436 | } | 2436 | } |