diff options
author | Mario Kleiner <mario.kleiner.de@gmail.com> | 2013-10-30 00:13:07 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-11-05 20:53:42 -0500 |
commit | d47abc585d26ce48e31a3b77d6414f507c5e9519 (patch) | |
tree | 0db7c68389c8d8a7f688482a08870901d956df37 /drivers/gpu/drm/radeon/radeon_pm.c | |
parent | 8f6fce03ddaf10bfa40c7d6cd59b778d35d41800 (diff) |
drm/radeon: Push get_scanout_position() timestamping into kms driver.
Move the ktime_get() clock readouts and potential preempt_disable()
calls from drm core into kms driver to make it compatible with the
api changes in the drm core.
This should not introduce any change in functionality or behaviour
in radeon-kms, just a reshuffling of code.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_pm.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index 2baa0fa75e36..981fd06e1f9a 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c | |||
@@ -1487,7 +1487,7 @@ static bool radeon_pm_in_vbl(struct radeon_device *rdev) | |||
1487 | */ | 1487 | */ |
1488 | for (crtc = 0; (crtc < rdev->num_crtc) && in_vbl; crtc++) { | 1488 | for (crtc = 0; (crtc < rdev->num_crtc) && in_vbl; crtc++) { |
1489 | if (rdev->pm.active_crtcs & (1 << crtc)) { | 1489 | if (rdev->pm.active_crtcs & (1 << crtc)) { |
1490 | vbl_status = radeon_get_crtc_scanoutpos(rdev->ddev, crtc, &vpos, &hpos); | 1490 | vbl_status = radeon_get_crtc_scanoutpos(rdev->ddev, crtc, &vpos, &hpos, NULL, NULL); |
1491 | if ((vbl_status & DRM_SCANOUTPOS_VALID) && | 1491 | if ((vbl_status & DRM_SCANOUTPOS_VALID) && |
1492 | !(vbl_status & DRM_SCANOUTPOS_INVBL)) | 1492 | !(vbl_status & DRM_SCANOUTPOS_INVBL)) |
1493 | in_vbl = false; | 1493 | in_vbl = false; |