diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 05:34:41 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-12-17 20:33:24 -0500 |
commit | bfd8303af0c46bd094289ee4e65f1e4bcc4fb7d3 (patch) | |
tree | cf305ff6c73fb4ff2383ba119e5c5285cbaa79a4 /drivers/gpu/drm/via | |
parent | d2e546b855646f251046098ddaccef50bf3d4302 (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/via')
-rw-r--r-- | drivers/gpu/drm/via/via_dmablit.c | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_irq.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_video.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 8b0f25904e6d..9236ef1de270 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c | |||
@@ -363,7 +363,7 @@ via_dmablit_handler(struct drm_device *dev, int engine, int from_irq) | |||
363 | 363 | ||
364 | via_abort_dmablit(dev, engine); | 364 | via_abort_dmablit(dev, engine); |
365 | blitq->aborting = 1; | 365 | blitq->aborting = 1; |
366 | blitq->end = jiffies + DRM_HZ; | 366 | blitq->end = jiffies + HZ; |
367 | } | 367 | } |
368 | 368 | ||
369 | if (!blitq->is_active) { | 369 | if (!blitq->is_active) { |
@@ -372,7 +372,7 @@ via_dmablit_handler(struct drm_device *dev, int engine, int from_irq) | |||
372 | blitq->is_active = 1; | 372 | blitq->is_active = 1; |
373 | blitq->cur = cur; | 373 | blitq->cur = cur; |
374 | blitq->num_outstanding--; | 374 | blitq->num_outstanding--; |
375 | blitq->end = jiffies + DRM_HZ; | 375 | blitq->end = jiffies + HZ; |
376 | if (!timer_pending(&blitq->poll_timer)) | 376 | if (!timer_pending(&blitq->poll_timer)) |
377 | mod_timer(&blitq->poll_timer, jiffies + 1); | 377 | mod_timer(&blitq->poll_timer, jiffies + 1); |
378 | } else { | 378 | } else { |
@@ -436,7 +436,7 @@ via_dmablit_sync(struct drm_device *dev, uint32_t handle, int engine) | |||
436 | int ret = 0; | 436 | int ret = 0; |
437 | 437 | ||
438 | if (via_dmablit_active(blitq, engine, handle, &queue)) { | 438 | if (via_dmablit_active(blitq, engine, handle, &queue)) { |
439 | DRM_WAIT_ON(ret, *queue, 3 * DRM_HZ, | 439 | DRM_WAIT_ON(ret, *queue, 3 * HZ, |
440 | !via_dmablit_active(blitq, engine, handle, NULL)); | 440 | !via_dmablit_active(blitq, engine, handle, NULL)); |
441 | } | 441 | } |
442 | DRM_DEBUG("DMA blit sync handle 0x%x engine %d returned %d\n", | 442 | DRM_DEBUG("DMA blit sync handle 0x%x engine %d returned %d\n", |
@@ -688,7 +688,7 @@ via_dmablit_grab_slot(drm_via_blitq_t *blitq, int engine) | |||
688 | while (blitq->num_free == 0) { | 688 | while (blitq->num_free == 0) { |
689 | spin_unlock_irqrestore(&blitq->blit_lock, irqsave); | 689 | spin_unlock_irqrestore(&blitq->blit_lock, irqsave); |
690 | 690 | ||
691 | DRM_WAIT_ON(ret, blitq->busy_queue, DRM_HZ, blitq->num_free > 0); | 691 | DRM_WAIT_ON(ret, blitq->busy_queue, HZ, blitq->num_free > 0); |
692 | if (ret) | 692 | if (ret) |
693 | return (-EINTR == ret) ? -EAGAIN : ret; | 693 | return (-EINTR == ret) ? -EAGAIN : ret; |
694 | 694 | ||
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c index ac98964297cf..d0e2b988d067 100644 --- a/drivers/gpu/drm/via/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c | |||
@@ -239,12 +239,12 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence | |||
239 | cur_irq = dev_priv->via_irqs + real_irq; | 239 | cur_irq = dev_priv->via_irqs + real_irq; |
240 | 240 | ||
241 | if (masks[real_irq][2] && !force_sequence) { | 241 | if (masks[real_irq][2] && !force_sequence) { |
242 | DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ, | 242 | DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ, |
243 | ((VIA_READ(masks[irq][2]) & masks[irq][3]) == | 243 | ((VIA_READ(masks[irq][2]) & masks[irq][3]) == |
244 | masks[irq][4])); | 244 | masks[irq][4])); |
245 | cur_irq_sequence = atomic_read(&cur_irq->irq_received); | 245 | cur_irq_sequence = atomic_read(&cur_irq->irq_received); |
246 | } else { | 246 | } else { |
247 | DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ, | 247 | DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ, |
248 | (((cur_irq_sequence = | 248 | (((cur_irq_sequence = |
249 | atomic_read(&cur_irq->irq_received)) - | 249 | atomic_read(&cur_irq->irq_received)) - |
250 | *sequence) <= (1 << 23))); | 250 | *sequence) <= (1 << 23))); |
diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c index 6569efa2ff6e..f60cfb654428 100644 --- a/drivers/gpu/drm/via/via_video.c +++ b/drivers/gpu/drm/via/via_video.c | |||
@@ -83,7 +83,7 @@ int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_ | |||
83 | switch (fx->func) { | 83 | switch (fx->func) { |
84 | case VIA_FUTEX_WAIT: | 84 | case VIA_FUTEX_WAIT: |
85 | DRM_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock], | 85 | DRM_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock], |
86 | (fx->ms / 10) * (DRM_HZ / 100), *lock != fx->val); | 86 | (fx->ms / 10) * (HZ / 100), *lock != fx->val); |
87 | return ret; | 87 | return ret; |
88 | case VIA_FUTEX_WAKE: | 88 | case VIA_FUTEX_WAKE: |
89 | DRM_WAKEUP(&(dev_priv->decoder_queue[fx->lock])); | 89 | DRM_WAKEUP(&(dev_priv->decoder_queue[fx->lock])); |