[src/trunk]: src/sys/external/bsd/drm2/include/drm DRM_HZ -> HZ, to reduce di...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/64d644b65c05
branches:  trunk
changeset: 1007317:64d644b65c05
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Feb 14 04:37:43 2020 +0000

description:
DRM_HZ -> HZ, to reduce diffs.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon.h      |   4 ++--
 sys/external/bsd/drm2/dist/drm/via/via_dmablit.c    |  12 ++++++------
 sys/external/bsd/drm2/dist/drm/via/via_irq.c        |   8 ++++----
 sys/external/bsd/drm2/dist/drm/via/via_video.c      |   6 +++---
 sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h |   4 +---
 5 files changed, 16 insertions(+), 18 deletions(-)

diffs (151 lines):

diff -r 21f3f9c30546 -r 64d644b65c05 sys/external/bsd/drm2/dist/drm/radeon/radeon.h
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon.h    Fri Feb 14 04:37:27 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon.h    Fri Feb 14 04:37:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon.h,v 1.7 2020/01/26 14:36:35 jmcneill Exp $      */
+/*     $NetBSD: radeon.h,v 1.8 2020/02/14 04:37:43 riastradh Exp $     */
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -127,7 +127,7 @@
  * symbol;
  */
 #define RADEON_MAX_USEC_TIMEOUT                        100000  /* 100 ms */
-#define RADEON_FENCE_JIFFIES_TIMEOUT           (DRM_HZ / 2)
+#define RADEON_FENCE_JIFFIES_TIMEOUT           (HZ / 2)
 /* RADEON_IB_POOL_SIZE must be a power of 2 */
 #define RADEON_IB_POOL_SIZE                    16
 #define RADEON_DEBUGFS_MAX_COMPONENTS          32
diff -r 21f3f9c30546 -r 64d644b65c05 sys/external/bsd/drm2/dist/drm/via/via_dmablit.c
--- a/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c  Fri Feb 14 04:37:27 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/via/via_dmablit.c  Fri Feb 14 04:37:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: via_dmablit.c,v 1.6 2018/08/27 04:58:37 riastradh Exp $        */
+/*     $NetBSD: via_dmablit.c,v 1.7 2020/02/14 04:37:43 riastradh Exp $        */
 
 /* via_dmablit.c -- PCI DMA BitBlt support for the VIA Unichrome/Pro
  *
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_dmablit.c,v 1.6 2018/08/27 04:58:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_dmablit.c,v 1.7 2020/02/14 04:37:43 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/via_drm.h>
@@ -514,7 +514,7 @@
 
                via_abort_dmablit(dev, engine);
                blitq->aborting = 1;
-               blitq->end = jiffies + DRM_HZ;
+               blitq->end = jiffies + HZ;
        }
 
        if (!blitq->is_active) {
@@ -523,7 +523,7 @@
                        blitq->is_active = 1;
                        blitq->cur = cur;
                        blitq->num_outstanding--;
-                       blitq->end = jiffies + DRM_HZ;
+                       blitq->end = jiffies + HZ;
                        if (!timer_pending(&blitq->poll_timer))
                                mod_timer(&blitq->poll_timer, jiffies + 1);
                } else {
@@ -603,7 +603,7 @@
 #ifdef __NetBSD__
        spin_lock(&blitq->blit_lock);
        if (via_dmablit_active(blitq, engine, handle, &queue)) {
-               DRM_SPIN_WAIT_ON(ret, queue, &blitq->blit_lock, 3*DRM_HZ,
+               DRM_SPIN_WAIT_ON(ret, queue, &blitq->blit_lock, 3*HZ,
                    !via_dmablit_active(blitq, engine, handle, NULL));
        }
        spin_unlock(&blitq->blit_lock);
@@ -881,7 +881,7 @@
        while (blitq->num_free == 0) {
 #ifdef __NetBSD__
                DRM_SPIN_WAIT_ON(ret, &blitq->busy_queue, &blitq->blit_lock,
-                   DRM_HZ,
+                   HZ,
                    blitq->num_free > 0);
                /* Map -EINTR to -EAGAIN.  */
                if (ret == -EINTR)
diff -r 21f3f9c30546 -r 64d644b65c05 sys/external/bsd/drm2/dist/drm/via/via_irq.c
--- a/sys/external/bsd/drm2/dist/drm/via/via_irq.c      Fri Feb 14 04:37:27 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/via/via_irq.c      Fri Feb 14 04:37:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: via_irq.c,v 1.6 2018/08/27 04:58:37 riastradh Exp $    */
+/*     $NetBSD: via_irq.c,v 1.7 2020/02/14 04:37:43 riastradh Exp $    */
 
 /* via_irq.c
  *
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_irq.c,v 1.6 2018/08/27 04:58:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_irq.c,v 1.7 2020/02/14 04:37:43 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/via_drm.h>
@@ -256,13 +256,13 @@
        spin_lock(&cur_irq->irq_lock);
        if (masks[real_irq][2] && !force_sequence) {
                DRM_SPIN_WAIT_ON(ret, &cur_irq->irq_queue, &cur_irq->irq_lock,
-                   3 * DRM_HZ,
+                   3 * HZ,
                    ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
                        masks[irq][4]));
                cur_irq_sequence = cur_irq->irq_received;
        } else {
                DRM_SPIN_WAIT_ON(ret, &cur_irq->irq_queue, &cur_irq->irq_lock,
-                   3 * DRM_HZ,
+                   3 * HZ,
                    (((cur_irq_sequence = cur_irq->irq_received) -
                        *sequence) <= (1 << 23)));
        }
diff -r 21f3f9c30546 -r 64d644b65c05 sys/external/bsd/drm2/dist/drm/via/via_video.c
--- a/sys/external/bsd/drm2/dist/drm/via/via_video.c    Fri Feb 14 04:37:27 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/via/via_video.c    Fri Feb 14 04:37:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: via_video.c,v 1.6 2018/08/27 04:58:37 riastradh Exp $  */
+/*     $NetBSD: via_video.c,v 1.7 2020/02/14 04:37:43 riastradh Exp $  */
 
 /*
  * Copyright 2005 Thomas Hellstrom. All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_video.c,v 1.6 2018/08/27 04:58:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_video.c,v 1.7 2020/02/14 04:37:43 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/via_drm.h>
@@ -111,7 +111,7 @@
                spin_lock(&dev_priv->decoder_lock[fx->lock]);
                DRM_SPIN_WAIT_ON(ret, &dev_priv->decoder_queue[fx->lock],
                    &dev_priv->decoder_lock[fx->lock],
-                   (fx->ms / 10) * (DRM_HZ / 100),
+                   (fx->ms / 10) * (HZ / 100),
                    *lock != fx->val);
                spin_unlock(&dev_priv->decoder_lock[fx->lock]);
 #else
diff -r 21f3f9c30546 -r 64d644b65c05 sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h       Fri Feb 14 04:37:27 2020 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h       Fri Feb 14 04:37:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_wait_netbsd.h,v 1.15 2019/04/16 10:00:04 mrg Exp $ */
+/*     $NetBSD: drm_wait_netbsd.h,v 1.16 2020/02/14 04:37:43 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -44,8 +44,6 @@
 
 typedef kcondvar_t drm_waitqueue_t;
 
-#define        DRM_HZ  hz              /* XXX Hurk...  */
-
 #define        DRM_UDELAY      DELAY
 
 static inline void