diff options
author | Mario Kleiner <mario.kleiner.de@gmail.com> | 2013-10-30 05:13:07 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-11-06 11:53:42 +1000 |
commit | d47abc585d26ce48e31a3b77d6414f507c5e9519 (patch) | |
tree | 0db7c68389c8d8a7f688482a08870901d956df37 /drivers/gpu/drm/radeon/radeon_drv.c | |
parent | 8f6fce03ddaf10bfa40c7d6cd59b778d35d41800 (diff) | |
download | op-kernel-dev-d47abc585d26ce48e31a3b77d6414f507c5e9519.zip op-kernel-dev-d47abc585d26ce48e31a3b77d6414f507c5e9519.tar.gz |
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_drv.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index dfd4149..aab2417 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -107,7 +107,8 @@ int radeon_gem_object_open(struct drm_gem_object *obj, void radeon_gem_object_close(struct drm_gem_object *obj, struct drm_file *file_priv); extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc, - int *vpos, int *hpos); + int *vpos, int *hpos, ktime_t *stime, + ktime_t *etime); extern const struct drm_ioctl_desc radeon_ioctls_kms[]; extern int radeon_max_kms_ioctl; int radeon_mmap(struct file *filp, struct vm_area_struct *vma); |