diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-12-03 14:00:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-12-03 14:00:52 +1000 |
| commit | 7e76c5cf6f4dbfb18325de5408c0ac8d3f271d85 (patch) | |
| tree | 55986f85c5688906ef02da13ae589ab69d661166 /drivers/gpu/drm/radeon/radeon_pm.c | |
| parent | a9979d6077e4482dbe64cedc4bb181d5576d13f7 (diff) | |
| parent | acb325062afc09c196f7d3888b81312e6ebcdc35 (diff) | |
| download | kernel_samsung_espresso10-7e76c5cf6f4dbfb18325de5408c0ac8d3f271d85.zip kernel_samsung_espresso10-7e76c5cf6f4dbfb18325de5408c0ac8d3f271d85.tar.gz kernel_samsung_espresso10-7e76c5cf6f4dbfb18325de5408c0ac8d3f271d85.tar.bz2 | |
Merge branch 'drm-radeon-next' of ../drm-radeon-next into drm-core-next
* 'drm-radeon-next' of ../drm-radeon-next:
drm/radeon/kms: improve pflip precision on r1xx-r4xx
drm/kms/radeon: Use high precision timestamps for pageflip completion events.
drm/kms/radeon: Reorder vblank and pageflip interrupt handling.
drm/radeon/kms: add pageflip ioctl support (v3)
drm/kms/radeon: Add support for precise vblank timestamping.
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_pm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index 8c9b2ef..5eda5e4 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -720,9 +720,9 @@ static bool radeon_pm_in_vbl(struct radeon_device *rdev) */ for (crtc = 0; (crtc < rdev->num_crtc) && in_vbl; crtc++) { if (rdev->pm.active_crtcs & (1 << crtc)) { - vbl_status = radeon_get_crtc_scanoutpos(rdev, crtc, &vpos, &hpos); - if ((vbl_status & RADEON_SCANOUTPOS_VALID) && - !(vbl_status & RADEON_SCANOUTPOS_INVBL)) + vbl_status = radeon_get_crtc_scanoutpos(rdev->ddev, crtc, &vpos, &hpos); + if ((vbl_status & DRM_SCANOUTPOS_VALID) && + !(vbl_status & DRM_SCANOUTPOS_INVBL)) in_vbl = false; } } |