diff options
| author |   Mario Kleiner <mario.kleiner.de@gmail.com> | 2013-10-30 05:13:05 +0100 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2013-11-06 11:53:40 +1000 |
| commit | 862cc8b4bba9381c1824a0b7ed6404ec2cfb21b1 (patch) | |
| tree | ed295bdd9cf55bc644b81e3c7fe0dc70fcbab5be /drivers/gpu/drm/drm_irq.c | |
| parent | Merge branch 'drm-next-3.13' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
| download | linux-dev-862cc8b4bba9381c1824a0b7ed6404ec2cfb21b1.tar.xz linux-dev-862cc8b4bba9381c1824a0b7ed6404ec2cfb21b1.zip | |
drm: Remove preempt_disable() from vblank timestamping code.
Preemption handling will get pushed into the kms
drivers in followup patches, to make timestamping
more robust and PREEMPT_RT friendly.
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/drm_irq.c')
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index f9af048828ea..33ee515c9777 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -586,11 +586,6 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, * code gets preempted or delayed for some reason. */ for (i = 0; i < DRM_TIMESTAMP_MAXRETRIES; i++) { - /* Disable preemption to make it very likely to - * succeed in the first iteration even on PREEMPT_RT kernel. - */ - preempt_disable(); - /* Get system timestamp before query. */ stime = ktime_get(); @@ -602,8 +597,6 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, if (!drm_timestamp_monotonic) mono_time_offset = ktime_get_monotonic_offset(); - preempt_enable(); - /* Return as no-op if scanout query unsupported or failed. */ if (!(vbl_status & DRM_SCANOUTPOS_VALID)) { DRM_DEBUG("crtc %d : scanoutpos query failed [%d].\n", |