[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display i915: Keep i915_...

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

details:   https://anonhg.NetBSD.org/src/rev/350bb2713a0b
branches:  trunk
changeset: 1028750:350bb2713a0b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:56:08 2021 +0000

description:
i915: Keep i915_sw_fence_init/fini paired.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.c  |  6 ++++--
 sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.h  |  7 ++++++-
 sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c |  9 ++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diffs (83 lines):

diff -r 83d7c740c129 -r 350bb2713a0b sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.c        Sun Dec 19 11:55:58 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.c        Sun Dec 19 11:56:08 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_atomic.c,v 1.3 2021/12/19 11:38:03 riastradh Exp $       */
+/*     $NetBSD: intel_atomic.c,v 1.4 2021/12/19 11:56:08 riastradh Exp $       */
 
 /*
  * Copyright © 2015 Intel Corporation
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_atomic.c,v 1.3 2021/12/19 11:38:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_atomic.c,v 1.4 2021/12/19 11:56:08 riastradh Exp $");
 
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
@@ -496,6 +496,8 @@
                return NULL;
        }
 
+       i915_sw_fence_init(&state->commit_ready, intel_atomic_commit_ready);
+
        return &state->base;
 }
 
diff -r 83d7c740c129 -r 350bb2713a0b sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.h
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.h        Sun Dec 19 11:55:58 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.h        Sun Dec 19 11:56:08 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_atomic.h,v 1.2 2021/12/18 23:45:29 riastradh Exp $       */
+/*     $NetBSD: intel_atomic.h,v 1.3 2021/12/19 11:56:08 riastradh Exp $       */
 
 /* SPDX-License-Identifier: MIT */
 /*
@@ -61,4 +61,9 @@
 
 int intel_atomic_serialize_global_state(struct intel_atomic_state *state);
 
+#include "i915_sw_fence.h"
+int __i915_sw_fence_call
+intel_atomic_commit_ready(struct i915_sw_fence *fence,
+                         enum i915_sw_fence_notify notify);
+
 #endif /* __INTEL_ATOMIC_H__ */
diff -r 83d7c740c129 -r 350bb2713a0b sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c       Sun Dec 19 11:55:58 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c       Sun Dec 19 11:56:08 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_display.c,v 1.5 2021/12/19 11:55:24 riastradh Exp $      */
+/*     $NetBSD: intel_display.c,v 1.6 2021/12/19 11:56:08 riastradh Exp $      */
 
 /*
  * Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.5 2021/12/19 11:55:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.6 2021/12/19 11:56:08 riastradh Exp $");
 
 #include "intel_display.h"     /* for pipe_drmhack */
 
@@ -15503,7 +15503,7 @@
        intel_atomic_commit_tail(state);
 }
 
-static int __i915_sw_fence_call
+int __i915_sw_fence_call
 intel_atomic_commit_ready(struct i915_sw_fence *fence,
                          enum i915_sw_fence_notify notify)
 {
@@ -15560,8 +15560,7 @@
        state->wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);
 
        drm_atomic_state_get(&state->base);
-       i915_sw_fence_init(&state->commit_ready,
-                          intel_atomic_commit_ready);
+       i915_sw_fence_reinit(&state->commit_ready);
 
        /*
         * The intel_legacy_cursor_update() fast path takes care