aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_irq.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-11 05:34:41 -0500
committerDave Airlie <airlied@redhat.com>2013-12-17 20:33:24 -0500
commitbfd8303af0c46bd094289ee4e65f1e4bcc4fb7d3 (patch)
treecf305ff6c73fb4ff2383ba119e5c5285cbaa79a4 /drivers/gpu/drm/drm_irq.c
parentd2e546b855646f251046098ddaccef50bf3d4302 (diff)
drm: Kill DRM_HZ
We don't have any userspace interfaces that use HZ as a time unit, so having our own DRM define is useless. Remove this remnant from the shared drm core days. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 64c34d5876ff..b52ff052b785 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -960,7 +960,7 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
960 if (atomic_dec_and_test(&dev->vblank[crtc].refcount) && 960 if (atomic_dec_and_test(&dev->vblank[crtc].refcount) &&
961 (drm_vblank_offdelay > 0)) 961 (drm_vblank_offdelay > 0))
962 mod_timer(&dev->vblank_disable_timer, 962 mod_timer(&dev->vblank_disable_timer,
963 jiffies + ((drm_vblank_offdelay * DRM_HZ)/1000)); 963 jiffies + ((drm_vblank_offdelay * HZ)/1000));
964} 964}
965EXPORT_SYMBOL(drm_vblank_put); 965EXPORT_SYMBOL(drm_vblank_put);
966 966
@@ -1244,7 +1244,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
1244 DRM_DEBUG("waiting on vblank count %d, crtc %d\n", 1244 DRM_DEBUG("waiting on vblank count %d, crtc %d\n",
1245 vblwait->request.sequence, crtc); 1245 vblwait->request.sequence, crtc);
1246 dev->vblank[crtc].last_wait = vblwait->request.sequence; 1246 dev->vblank[crtc].last_wait = vblwait->request.sequence;
1247 DRM_WAIT_ON(ret, dev->vblank[crtc].queue, 3 * DRM_HZ, 1247 DRM_WAIT_ON(ret, dev->vblank[crtc].queue, 3 * HZ,
1248 (((drm_vblank_count(dev, crtc) - 1248 (((drm_vblank_count(dev, crtc) -
1249 vblwait->request.sequence) <= (1 << 23)) || 1249 vblwait->request.sequence) <= (1 << 23)) ||
1250 !dev->irq_enabled)); 1250 !dev->irq_enabled));