Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:56:08 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_atomic.c
intel_atomic.h intel_display.c
Log Message:
i915: Keep i915_sw_fence_init/fini paired.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.c:1.3 Sun Dec 19 11:38:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.c Sun Dec 19 11:56:08 2021
@@ -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 @@ intel_atomic_state_alloc(struct drm_devi
return NULL;
}
+ i915_sw_fence_init(&state->commit_ready, intel_atomic_commit_ready);
+
return &state->base;
}
Index: src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.h:1.2 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.h:1.2 Sat Dec 18 23:45:29 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_atomic.h Sun Dec 19 11:56:08 2021
@@ -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_lock_global_state(struc
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__ */
Index: src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c:1.5 Sun Dec 19 11:55:24 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c Sun Dec 19 11:56:08 2021
@@ -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 @@ static void intel_atomic_commit_work(str
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 @@ static int intel_atomic_commit(struct dr
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
