[src/trunk]: src/sys/external/bsd/drm2/dist/drm/vmwgfx Revert unnecessary typ...

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

details:   https://anonhg.NetBSD.org/src/rev/7e97eb28a00b
branches:  trunk
changeset: 1027756:7e97eb28a00b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 00:25:04 2021 +0000

description:
Revert unnecessary typo fixes in upstream code.

This reverts most of the changes under sys/external/bsd/drm2/dist
from

https://mail-index.netbsd.org/source-changes/2020/12/16/msg125197.html

(Some of them were applied upstream or were in code that's gone now.)

diffstat:

 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c |  8 ++++----
 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c |  6 +++---
 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c |  6 +++---
 sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c     |  8 ++++----
 sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_drv.h          |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diffs (144 lines):

diff -r 8fed90cfdd7a -r 7e97eb28a00b sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c       Sat Dec 18 23:54:51 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c       Sun Dec 19 00:25:04 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_uvd_v4_2.c,v 1.5 2021/12/18 23:44:58 riastradh Exp $    */
+/*     $NetBSD: amdgpu_uvd_v4_2.c,v 1.6 2021/12/19 00:25:04 riastradh Exp $    */
 
 /*
  * Copyright 2013 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v4_2.c,v 1.5 2021/12/18 23:44:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v4_2.c,v 1.6 2021/12/19 00:25:04 riastradh Exp $");
 
 #include <linux/firmware.h>
 
@@ -279,7 +279,7 @@
        /* enable VCPU clock */
        WREG32(mmUVD_VCPU_CNTL,  1 << 9);
 
-       /* disable interrupt */
+       /* disable interupt */
        WREG32_P(mmUVD_MASTINT_EN, 0, ~(1 << 1));
 
 #ifdef __BIG_ENDIAN
@@ -344,7 +344,7 @@
                return r;
        }
 
-       /* enable interrupt */
+       /* enable interupt */
        WREG32_P(mmUVD_MASTINT_EN, 3<<1, ~(3 << 1));
 
        WREG32_P(mmUVD_STATUS, 0, ~(1<<2));
diff -r 8fed90cfdd7a -r 7e97eb28a00b sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c       Sat Dec 18 23:54:51 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c       Sun Dec 19 00:25:04 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_uvd_v5_0.c,v 1.4 2021/12/18 23:44:58 riastradh Exp $    */
+/*     $NetBSD: amdgpu_uvd_v5_0.c,v 1.5 2021/12/19 00:25:04 riastradh Exp $    */
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v5_0.c,v 1.4 2021/12/18 23:44:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v5_0.c,v 1.5 2021/12/19 00:25:04 riastradh Exp $");
 
 #include <linux/delay.h>
 #include <linux/firmware.h>
@@ -311,7 +311,7 @@
 
        uvd_v5_0_mc_resume(adev);
 
-       /* disable interrupt */
+       /* disable interupt */
        WREG32_P(mmUVD_MASTINT_EN, 0, ~(1 << 1));
 
        /* stall UMC and register bus before resetting VCPU */
diff -r 8fed90cfdd7a -r 7e97eb28a00b sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c       Sat Dec 18 23:54:51 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c       Sun Dec 19 00:25:04 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_uvd_v6_0.c,v 1.4 2021/12/18 23:44:58 riastradh Exp $    */
+/*     $NetBSD: amdgpu_uvd_v6_0.c,v 1.5 2021/12/19 00:25:04 riastradh Exp $    */
 
 /*
  * Copyright 2014 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v6_0.c,v 1.4 2021/12/18 23:44:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd_v6_0.c,v 1.5 2021/12/19 00:25:04 riastradh Exp $");
 
 #include <linux/firmware.h>
 
@@ -718,7 +718,7 @@
 
        uvd_v6_0_mc_resume(adev);
 
-       /* disable interrupt */
+       /* disable interupt */
        WREG32_FIELD(UVD_MASTINT_EN, VCPU_EN, 0);
 
        /* stall UMC and register bus before resetting VCPU */
diff -r 8fed90cfdd7a -r 7e97eb28a00b sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c   Sat Dec 18 23:54:51 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c   Sun Dec 19 00:25:04 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_uvd_v1_0.c,v 1.5 2021/12/18 23:45:43 riastradh Exp $    */
+/*     $NetBSD: radeon_uvd_v1_0.c,v 1.6 2021/12/19 00:25:04 riastradh Exp $    */
 
 /*
  * Copyright 2013 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_uvd_v1_0.c,v 1.5 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_uvd_v1_0.c,v 1.6 2021/12/19 00:25:04 riastradh Exp $");
 
 #include <linux/firmware.h>
 
@@ -278,7 +278,7 @@
        /* disable clock gating */
        WREG32(UVD_CGC_GATE, 0);
 
-       /* disable interrupt */
+       /* disable interupt */
        WREG32_P(UVD_MASTINT_EN, 0, ~(1 << 1));
 
        /* Stall UMC and register bus before resetting VCPU */
@@ -356,7 +356,7 @@
                return r;
        }
 
-       /* enable interrupt */
+       /* enable interupt */
        WREG32_P(UVD_MASTINT_EN, 3<<1, ~(3 << 1));
 
        /* force RBC into idle state */
diff -r 8fed90cfdd7a -r 7e97eb28a00b sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_drv.h
--- a/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_drv.h        Sat Dec 18 23:54:51 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_drv.h        Sun Dec 19 00:25:04 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmwgfx_drv.h,v 1.4 2021/12/18 23:45:45 riastradh Exp $ */
+/*     $NetBSD: vmwgfx_drv.h,v 1.5 2021/12/19 00:25:04 riastradh Exp $ */
 
 /* SPDX-License-Identifier: GPL-2.0 OR MIT */
 /**************************************************************************
@@ -780,7 +780,7 @@
 extern int vmw_bo_init(struct vmw_private *dev_priv,
                       struct vmw_buffer_object *vmw_bo,
                       size_t size, struct ttm_placement *placement,
-                      bool interruptible,
+                      bool interuptable,
                       void (*bo_free)(struct ttm_buffer_object *bo));
 extern int vmw_user_bo_verify_access(struct ttm_buffer_object *bo,
                                     struct ttm_object_file *tfile);