[src/trunk]: src/sys/external/bsd/drm2/linux Revert "drm: Fix missing newline...

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

details:   https://anonhg.NetBSD.org/src/rev/4a1bbdff7067
branches:  trunk
changeset: 1029175:4a1bbdff7067
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Dec 24 15:25:03 2021 +0000

description:
Revert "drm: Fix missing newline in DRM_WARN."

Accidentally included more than I intended here.

diffstat:

 sys/external/bsd/drm2/dist/drm/scheduler/sched_entity.c |   6 +-
 sys/external/bsd/drm2/linux/linux_ww_mutex.c            |  31 +++++-----------
 2 files changed, 13 insertions(+), 24 deletions(-)

diffs (135 lines):

diff -r 1b7390cbb937 -r 4a1bbdff7067 sys/external/bsd/drm2/dist/drm/scheduler/sched_entity.c
--- a/sys/external/bsd/drm2/dist/drm/scheduler/sched_entity.c   Fri Dec 24 15:22:20 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/scheduler/sched_entity.c   Fri Dec 24 15:25:03 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sched_entity.c,v 1.5 2021/12/24 15:22:20 riastradh Exp $       */
+/*     $NetBSD: sched_entity.c,v 1.6 2021/12/24 15:25:03 riastradh Exp $       */
 
 /*
  * Copyright 2015 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sched_entity.c,v 1.5 2021/12/24 15:22:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sched_entity.c,v 1.6 2021/12/24 15:25:03 riastradh Exp $");
 
 #include <linux/kthread.h>
 #include <linux/slab.h>
@@ -142,7 +142,7 @@
                struct drm_gpu_scheduler *sched = entity->sched_list[i];
 
                if (!entity->sched_list[i]->ready) {
-                       DRM_WARN("sched%s is not ready, skipping\n", sched->name);
+                       DRM_WARN("sched%s is not ready, skipping", sched->name);
                        continue;
                }
 
diff -r 1b7390cbb937 -r 4a1bbdff7067 sys/external/bsd/drm2/linux/linux_ww_mutex.c
--- a/sys/external/bsd/drm2/linux/linux_ww_mutex.c      Fri Dec 24 15:22:20 2021 +0000
+++ b/sys/external/bsd/drm2/linux/linux_ww_mutex.c      Fri Dec 24 15:25:03 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_ww_mutex.c,v 1.11 2021/12/24 15:22:20 riastradh Exp $    */
+/*     $NetBSD: linux_ww_mutex.c,v 1.12 2021/12/24 15:25:03 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.11 2021/12/24 15:22:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.12 2021/12/24 15:25:03 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/atomic.h>
@@ -108,21 +108,6 @@
        ctx->wwx_acquire_done = true;
 }
 
-static void
-ww_acquire_done_check(struct ww_mutex *mutex, struct ww_acquire_ctx *ctx)
-{
-
-       /*
-        * If caller has invoked ww_acquire_done, we must already hold
-        * this mutex.
-        */
-       KASSERT(mutex_owned(&mutex->wwm_lock));
-       KASSERT((!ctx->wwx_acquire_done ||
-               (mutex->wwm_state == WW_CTX && mutex->wwm_u.ctx == ctx)),
-           "ctx %p done acquiring locks, refusing to acquire %p",
-           ctx, mutex);
-}
-
 void
 ww_acquire_fini(struct ww_acquire_ctx *ctx)
 {
@@ -567,6 +552,8 @@
 
        KASSERTMSG((ctx->wwx_owner == curlwp),
            "ctx %p owned by %p, not self (%p)", ctx, ctx->wwx_owner, curlwp);
+       KASSERTMSG(!ctx->wwx_acquire_done,
+           "ctx %p done acquiring locks, can't acquire more", ctx);
        KASSERTMSG((ctx->wwx_acquired != ~0U),
            "ctx %p finished, can't be used any more", ctx);
        KASSERTMSG((ctx->wwx_class == mutex->wwm_class),
@@ -574,7 +561,6 @@
            ctx, ctx->wwx_class, mutex, mutex->wwm_class);
 
        mutex_enter(&mutex->wwm_lock);
-       ww_acquire_done_check(mutex, ctx);
 retry: switch (mutex->wwm_state) {
        case WW_UNLOCKED:
                WW_WANTLOCK(mutex);
@@ -687,6 +673,8 @@
 
        KASSERTMSG((ctx->wwx_owner == curlwp),
            "ctx %p owned by %p, not self (%p)", ctx, ctx->wwx_owner, curlwp);
+       KASSERTMSG(!ctx->wwx_acquire_done,
+           "ctx %p done acquiring locks, can't acquire more", ctx);
        KASSERTMSG((ctx->wwx_acquired != ~0U),
            "ctx %p finished, can't be used any more", ctx);
        KASSERTMSG((ctx->wwx_class == mutex->wwm_class),
@@ -694,7 +682,6 @@
            ctx, ctx->wwx_class, mutex, mutex->wwm_class);
 
        mutex_enter(&mutex->wwm_lock);
-       ww_acquire_done_check(mutex, ctx);
 retry: switch (mutex->wwm_state) {
        case WW_UNLOCKED:
                WW_WANTLOCK(mutex);
@@ -808,6 +795,8 @@
 
        KASSERTMSG((ctx->wwx_owner == curlwp),
            "ctx %p owned by %p, not self (%p)", ctx, ctx->wwx_owner, curlwp);
+       KASSERTMSG(!ctx->wwx_acquire_done,
+           "ctx %p done acquiring locks, can't acquire more", ctx);
        KASSERTMSG((ctx->wwx_acquired != ~0U),
            "ctx %p finished, can't be used any more", ctx);
        KASSERTMSG((ctx->wwx_acquired == 0),
@@ -818,7 +807,6 @@
            ctx, ctx->wwx_class, mutex, mutex->wwm_class);
 
        mutex_enter(&mutex->wwm_lock);
-       ww_acquire_done_check(mutex, ctx);
 retry: switch (mutex->wwm_state) {
        case WW_UNLOCKED:
                mutex->wwm_state = WW_CTX;
@@ -886,6 +874,8 @@
 
        KASSERTMSG((ctx->wwx_owner == curlwp),
            "ctx %p owned by %p, not self (%p)", ctx, ctx->wwx_owner, curlwp);
+       KASSERTMSG(!ctx->wwx_acquire_done,
+           "ctx %p done acquiring locks, can't acquire more", ctx);
        KASSERTMSG((ctx->wwx_acquired != ~0U),
            "ctx %p finished, can't be used any more", ctx);
        KASSERTMSG((ctx->wwx_acquired == 0),
@@ -896,7 +886,6 @@
            ctx, ctx->wwx_class, mutex, mutex->wwm_class);
 
        mutex_enter(&mutex->wwm_lock);
-       ww_acquire_done_check(mutex, ctx);
 retry: switch (mutex->wwm_state) {
        case WW_UNLOCKED:
                mutex->wwm_state = WW_CTX;