CVS commit: src/tests/usr.bin/mixerctl
Module Name:src
Committed By: kre
Date: Sat Dec 18 10:50:48 UTC 2021
Modified Files:
src/tests/usr.bin/mixerctl: t_mixerctl.sh
Log Message:
Compensate for changes made in mixerctl.c rev 1.29
Usage msg now appears on stderr, and causes exit status to be 1
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/mixerctl/t_mixerctl.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/mixerctl/t_mixerctl.sh
diff -u src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.10 src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.11
--- src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.10 Tue Jul 25 22:28:22 2017
+++ src/tests/usr.bin/mixerctl/t_mixerctl.sh Sat Dec 18 10:50:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_mixerctl.sh,v 1.10 2017/07/25 22:28:22 kre Exp $
+# $NetBSD: t_mixerctl.sh,v 1.11 2021/12/18 10:50:48 kre Exp $
audio_setup() {
# Open /dev/pad0 so we have a configured audio device.
@@ -35,7 +35,7 @@ noargs_usage_head() {
noargs_usage_body() {
audio_setup
- atf_check -s exit:0 -o not-empty -e ignore \
+ atf_check -s exit:1 -o empty -e not-empty \
mixerctl
${padpid+kill -HUP ${padpid}} 2>/dev/null || :
CVS commit: src/tests/usr.bin/mixerctl
Module Name:src Committed By: kre Date: Sat Dec 18 10:50:48 UTC 2021 Modified Files: src/tests/usr.bin/mixerctl: t_mixerctl.sh Log Message: Compensate for changes made in mixerctl.c rev 1.29 Usage msg now appears on stderr, and causes exit status to be 1 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/mixerctl/t_mixerctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Dec 18 11:25:15 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: init.c
Log Message:
lint: use vector instead of list for designation in initialization
This change is a prerequisite for fixing the current bugs in handling
initializations. Part of the fix will be designation_pop, which is
costly for a singly linked list.
As a side benefit, memory management becomes simpler and needs fewer
malloc calls.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/usr.bin/xlint/lint1/init.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.217 src/usr.bin/xlint/lint1/init.c:1.218
--- src/usr.bin/xlint/lint1/init.c:1.217 Fri Dec 17 17:27:19 2021
+++ src/usr.bin/xlint/lint1/init.c Sat Dec 18 11:25:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.217 2021/12/17 17:27:19 rillig Exp $ */
+/* $NetBSD: init.c,v 1.218 2021/12/18 11:25:15 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.217 2021/12/17 17:27:19 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.218 2021/12/18 11:25:15 rillig Exp $");
#endif
#include
@@ -97,7 +97,6 @@ __RCSID("$NetBSD: init.c,v 1.217 2021/12
struct designator {
const char *dr_name; /* for struct and union */
size_t dr_subscript; /* for array */
- struct designator *dr_next;
};
/*
@@ -108,8 +107,9 @@ struct designator {
* C99 6.7.8p6, 6.7.8p7
*/
struct designation {
- struct designator *dn_head;
- struct designator *dn_tail;
+ struct designator *dn_items;
+ size_t dn_len;
+ size_t dn_cap;
};
/*
@@ -371,25 +371,6 @@ check_init_expr(const type_t *tp, sym_t
}
-static struct designator *
-designator_new(const char *name, size_t subscript)
-{
- struct designator *dr;
-
- dr = xcalloc(1, sizeof(*dr));
- dr->dr_name = name;
- dr->dr_subscript = subscript;
- return dr;
-}
-
-static void
-designator_free(struct designator *dr)
-{
-
- free(dr);
-}
-
-
static const type_t *
designator_look_up(const struct designator *dr, const type_t *tp)
{
@@ -427,14 +408,15 @@ designator_look_up(const struct designat
static void
designation_debug(const struct designation *dn)
{
- const struct designator *dr;
+ size_t i;
- if (dn->dn_head == NULL)
+ if (dn->dn_len == 0)
return;
debug_indent();
debug_printf("designation: ");
- for (dr = dn->dn_head; dr != NULL; dr = dr->dr_next) {
+ for (i = 0; i < dn->dn_len; i++) {
+ const struct designator *dr = dn->dn_items + i;
if (dr->dr_name != NULL) {
debug_printf(".%s", dr->dr_name);
lint_assert(dr->dr_subscript == 0);
@@ -450,17 +432,16 @@ designation_debug(const struct designati
static void
designation_add(struct designation *dn, const char *name, size_t subscript)
{
- struct designator *dr;
- dr = designator_new(name, subscript);
-
- if (dn->dn_head != NULL) {
- dn->dn_tail->dr_next = dr;
- dn->dn_tail = dr;
- } else {
- dn->dn_head = dr;
- dn->dn_tail = dr;
+ if (dn->dn_len == dn->dn_cap) {
+ dn->dn_cap += 4;
+ dn->dn_items = xrealloc(dn->dn_items,
+ dn->dn_cap * sizeof(dn->dn_items[0]));
}
+
+ dn->dn_items[dn->dn_len].dr_name = name;
+ dn->dn_items[dn->dn_len].dr_subscript = subscript;
+ dn->dn_len++;
}
/*
@@ -472,25 +453,25 @@ designation_add(struct designation *dn,
static const type_t *
designation_look_up(const struct designation *dn, const type_t *tp)
{
- const struct designator *dr;
+ size_t i;
- for (dr = dn->dn_head; dr != NULL && tp != NULL; dr = dr->dr_next)
- tp = designator_look_up(dr, tp);
+ for (i = 0; i < dn->dn_len && tp != NULL; i++)
+ tp = designator_look_up(dn->dn_items + i, tp);
return tp;
}
static void
designation_reset(struct designation *dn)
{
- struct designator *dr, *next;
- for (dr = dn->dn_head; dr != NULL; dr = next) {
- next = dr->dr_next;
- designator_free(dr);
- }
+ dn->dn_len = 0;
+}
- dn->dn_head = NULL;
- dn->dn_tail = NULL;
+static void
+designation_free(struct designation *dn)
+{
+
+ free(dn->dn_items);
}
@@ -512,7 +493,7 @@ static void
brace_level_free(struct brace_level *bl)
{
- designation_reset(&bl->bl_designation);
+ designation_free(&bl->bl_designation);
free(bl);
}
@@ -542,7 +523,7 @@ static const type_t *
brace_level_sub_type(const struct brace_level *bl, bool is_string)
{
- if (bl->bl_designation.dn_head != NULL)
+ if (bl->bl_designation.dn_len > 0)
return designation_look_up(&bl->bl_designation, bl->bl_type);
switch (bl->bl_type->t_tspec) {
@@ -583,10 +564,11 @@ brace_level_sub_type(const struct brace_
static void
brace_level_apply_designation(struct brace_level *bl)
{
- const struct designator *dr = bl->bl_designation.dn_head;
+ const struct designator *dr;
- if (dr == NULL)
+ if (bl->bl_designation.dn_len == 0)
return;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Dec 18 11:25:15 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: init.c Log Message: lint: use vector instead of list for designation in initialization This change is a prerequisite for fixing the current bugs in handling initializations. Part of the fix will be designation_pop, which is costly for a singly linked list. As a side benefit, memory management becomes simpler and needs fewer malloc calls. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.217 -r1.218 src/usr.bin/xlint/lint1/init.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Dec 18 11:37:00 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: format grammar consistently No binary change. To generate a diff of this commit: cvs rdiff -u -r1.375 -r1.376 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Dec 18 11:37:00 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: format grammar consistently
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.375 -r1.376 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.375 src/usr.bin/xlint/lint1/cgram.y:1.376
--- src/usr.bin/xlint/lint1/cgram.y:1.375 Thu Dec 16 23:46:21 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Dec 18 11:37:00 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.375 2021/12/16 23:46:21 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.376 2021/12/18 11:37:00 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.375 2021/12/16 23:46:21 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.376 2021/12/18 11:37:00 rillig Exp $");
#endif
#include
@@ -1374,11 +1374,11 @@ array_size:
$$ = $3;
}
| T_QUAL {
- /* C11, 6.7.6.2 */
+ /* C11 6.7.6.2 */
if ($1 != RESTRICT)
yyerror("Bad attribute");
$$ = NULL;
- }
+ }
| constant_expr
;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Dec 18 13:06:33 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: init.c Log Message: lint: move maximum seen subscript from brace level to initialization There is no need to store this information at every brace level since in any translation unit that survives a conforming C99 compiler, an array of unknown size is only possible once per initialization, not once per brace level. To generate a diff of this commit: cvs rdiff -u -r1.218 -r1.219 src/usr.bin/xlint/lint1/init.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Dec 18 13:06:33 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: init.c
Log Message:
lint: move maximum seen subscript from brace level to initialization
There is no need to store this information at every brace level since in
any translation unit that survives a conforming C99 compiler, an array
of unknown size is only possible once per initialization, not once per
brace level.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/usr.bin/xlint/lint1/init.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.218 src/usr.bin/xlint/lint1/init.c:1.219
--- src/usr.bin/xlint/lint1/init.c:1.218 Sat Dec 18 11:25:15 2021
+++ src/usr.bin/xlint/lint1/init.c Sat Dec 18 13:06:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.218 2021/12/18 11:25:15 rillig Exp $ */
+/* $NetBSD: init.c,v 1.219 2021/12/18 13:06:33 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.218 2021/12/18 11:25:15 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.219 2021/12/18 13:06:33 rillig Exp $");
#endif
#include
@@ -136,11 +136,6 @@ struct brace_level {
* unless a specific subscript is selected by a designator.
*/
size_t bl_subscript;
- /*
- * The maximum subscript that has ever be seen; only relevant for an
- * array of unknown size at the outermost brace level.
- */
- size_t bl_max_subscript;
bool bl_scalar_done: 1; /* for scalars */
bool bl_confused: 1; /* skip further checks */
@@ -161,6 +156,12 @@ struct initialization {
struct brace_level *in_brace_level;
/*
+ * The maximum subscript that has ever be seen for an array of
+ * unknown size, which can only occur at the outermost brace level.
+ */
+ size_t in_max_subscript;
+
+ /*
* Is set when a structural error occurred in the initialization.
* The effect is that the rest of the initialization is ignored
* (parsed by yacc, expression trees built, but no initialization
@@ -595,7 +596,7 @@ brace_level_apply_designation(struct bra
* C99 6.7.8p17
*/
static void
-brace_level_advance(struct brace_level *bl)
+brace_level_advance(struct brace_level *bl, size_t *max_subscript)
{
switch (bl->bl_type->t_tspec) {
@@ -608,8 +609,8 @@ brace_level_advance(struct brace_level *
break;
case ARRAY:
bl->bl_subscript++;
- if (bl->bl_subscript > bl->bl_max_subscript)
- bl->bl_max_subscript = bl->bl_subscript;
+ if (bl->bl_subscript > *max_subscript)
+ *max_subscript = bl->bl_subscript;
break;
default:
bl->bl_scalar_done = true;
@@ -735,7 +736,7 @@ initialization_set_size_of_unknown_array
in->in_brace_level->bl_enclosing == NULL))
return;
- dim = in->in_brace_level->bl_max_subscript;
+ dim = in->in_max_subscript;
if (dim == 0 && (in->in_err || in->in_brace_level->bl_confused))
dim = 1; /* prevent "empty array declaration: %s" */
@@ -759,7 +760,7 @@ initialization_end_brace_level(struct in
bl = in->in_brace_level;
if (bl != NULL)
- brace_level_advance(bl);
+ brace_level_advance(bl, &in->in_max_subscript);
if (bl != NULL)
designation_reset(&bl->bl_designation);
@@ -913,7 +914,7 @@ initialization_expr(struct initializatio
advance:
if (bl != NULL)
- brace_level_advance(bl);
+ brace_level_advance(bl, &in->in_max_subscript);
done:
if (bl != NULL)
designation_reset(&bl->bl_designation);
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Dec 18 13:23:09 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: init.c Log Message: lint: document wrong data structures for modelling initializations No functional change. To generate a diff of this commit: cvs rdiff -u -r1.219 -r1.220 src/usr.bin/xlint/lint1/init.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Dec 18 13:23:09 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: init.c
Log Message:
lint: document wrong data structures for modelling initializations
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/usr.bin/xlint/lint1/init.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.219 src/usr.bin/xlint/lint1/init.c:1.220
--- src/usr.bin/xlint/lint1/init.c:1.219 Sat Dec 18 13:06:33 2021
+++ src/usr.bin/xlint/lint1/init.c Sat Dec 18 13:23:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.219 2021/12/18 13:06:33 rillig Exp $ */
+/* $NetBSD: init.c,v 1.220 2021/12/18 13:23:09 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.219 2021/12/18 13:06:33 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.220 2021/12/18 13:23:09 rillig Exp $");
#endif
#include
@@ -60,11 +60,10 @@ __RCSID("$NetBSD: init.c,v 1.219 2021/12
* struct { int x, y; } point = { 3, 4 };
* struct { int x, y; } point = { .y = 4, .x = 3 };
*
- * Any scalar expression in the initializer may be surrounded by arbitrarily
- * many extra pairs of braces, like in the example 'number_with_braces' (C99
- * 6.7.8p11).
+ * Any scalar expression or string in the initializer may be surrounded by
+ * additional pairs of braces.
*
- * For multi-dimensional arrays, the inner braces may be omitted like in
+ * For nested aggregate objects, the inner braces may be omitted like in
* array_flat or spelled out like in array_nested. This is unusual in
* practice and therefore only supported very basically.
*
@@ -84,6 +83,7 @@ __RCSID("$NetBSD: init.c,v 1.219 2021/12
*
* See also:
* C99 6.7.8 "Initialization"
+ * C11 6.7.9 "Initialization"
* d_c99_init.c for more examples
*/
@@ -100,44 +100,66 @@ struct designator {
};
/*
- * The optional designation for an initializer, saying which sub-object to
- * initialize. Examples for designations are '.member' or
- * '.member[123].member.member[1][1]'.
+ * The path from the "current object" of a brace level to the sub-object that
+ * will be initialized by the next expression. Examples for designations are
+ * '.member' or '.member[123].member.member[1][1]'.
*
* C99 6.7.8p6, 6.7.8p7
*/
struct designation {
struct designator *dn_items;
- size_t dn_len;
- size_t dn_cap;
+ size_t dn_len;
+ size_t dn_cap;
};
/*
- * Describes a single brace level of an ongoing initialization.
+ * Everything that happens between a '{' and the corresponding '}' of an
+ * initialization.
*
- * See C99 6.7.8p17.
+ * C99 6.7.8p17
*/
struct brace_level {
- /*
- * The type of the current object that is initialized at this brace
- * level.
- */
+ /* The type of the "current object". */
const type_t *bl_type;
- struct designation bl_designation; /* .member[123].member */
+ /*
+ * The path to the sub-object of the "current object" that is
+ * initialized by the next expression.
+ *
+ * TODO: use this not only for explicit designations but also for
+ * implicit designations, like in C90.
+ */
+ struct designation bl_designation;
/*
* The next member of the struct or union that is to be initialized,
* unless a specific member is selected by a designator.
+ *
+ * TODO: use bl_designation instead.
*/
const sym_t *bl_member;
/*
* The subscript of the next array element that is to be initialized,
* unless a specific subscript is selected by a designator.
+ *
+ * TODO: use bl_designation instead.
*/
size_t bl_subscript;
- bool bl_scalar_done: 1; /* for scalars */
- bool bl_confused: 1; /* skip further checks */
+
+ /*
+ * Whether the designation is used up, that is, there is no next
+ * sub-object left to be initialized.
+ */
+ bool bl_scalar_done:1; /* for scalars */
+
+ /*
+ * Whether lint has been confused by allowed but extra or omitted
+ * braces. In such a case, lint skips further type checks on the
+ * initializer expressions.
+ *
+ * TODO: properly handle the omitted braces.
+ */
+ bool bl_confused:1;
struct brace_level *bl_enclosing;
};
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sat Dec 18 14:48:14 UTC 2021 Modified Files: src/sys/dev/usb: ehci.c Log Message: Fix two bugs i) EHCI_HCSPARAMS should be read with EREAD4 (and not EOREAD4). Spotted by jmcneill ii) Apply brackets so that ?: vs | operator precedence doesn't give the wrong result. To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/sys/dev/usb/ehci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sat Dec 18 14:48:14 UTC 2021 Modified Files: src/sys/dev/usb: ehci.c Log Message: Fix two bugs i) EHCI_HCSPARAMS should be read with EREAD4 (and not EOREAD4). Spotted by jmcneill ii) Apply brackets so that ?: vs | operator precedence doesn't give the wrong result. To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/sys/dev/usb/ehci.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/dev/usb/ehci.c diff -u src/sys/dev/usb/ehci.c:1.290 src/sys/dev/usb/ehci.c:1.291 --- src/sys/dev/usb/ehci.c:1.290 Tue Dec 7 08:04:10 2021 +++ src/sys/dev/usb/ehci.c Sat Dec 18 14:48:14 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.290 2021/12/07 08:04:10 skrll Exp $ */ +/* $NetBSD: ehci.c,v 1.291 2021/12/18 14:48:14 skrll Exp $ */ /* * Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc. @@ -54,7 +54,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.290 2021/12/07 08:04:10 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.291 2021/12/18 14:48:14 skrll Exp $"); #include "ohci.h" #include "uhci.h" @@ -2426,11 +2426,10 @@ ehci_roothub_ctrl(struct usbd_bus *bus, totlen = uimin(buflen, sizeof(hubd)); memcpy(&hubd, buf, totlen); hubd.bNbrPorts = sc->sc_noport; - v = EOREAD4(sc, EHCI_HCSPARAMS); + v = EREAD4(sc, EHCI_HCSPARAMS); USETW(hubd.wHubCharacteristics, - EHCI_HCS_PPC(v) ? UHD_PWR_INDIVIDUAL : UHD_PWR_NO_SWITCH | - EHCI_HCS_P_INDICATOR(EREAD4(sc, EHCI_HCSPARAMS)) - ? UHD_PORT_IND : 0); + (EHCI_HCS_PPC(v) ? UHD_PWR_INDIVIDUAL : UHD_PWR_NO_SWITCH) | + (EHCI_HCS_P_INDICATOR(v) ? UHD_PORT_IND : 0)); hubd.bPwrOn2PwrGood = 200; /* XXX can't find out? */ for (i = 0, l = sc->sc_noport; l > 0; i++, l -= 8, v >>= 8) hubd.DeviceRemovable[i++] = 0; /* XXX can't find out? */
CVS import: src/sys/external/bsd/acpica/dist
Module Name:src Committed By: christos Date: Sat Dec 18 16:18:40 UTC 2021 Update of /cvsroot/src/sys/external/bsd/acpica/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12645 Log Message: Import acpica-20211217 17 December 2021. Summary of changes for version 20211217: This release is available at https://acpica.org/downloads 1) ACPICA kernel-resident subsystem: Hardware: Do not flush CPU cache when entering S4 and S5. According to ACPI 6.4, Section 16.2, the CPU cache flushing is required on entering to S1, S2, and S3, but the ACPICA code flushes the CPU cache regardless of the sleep state. Blind cache flush on entering S5 causes problems for TDX. Avoid subobject buffer overflow when validating RSDP signature. Since the Signature member is accessed through an ACPI_TABLE_HEADER, the pointer to it is only to a 4-char array, and so trying to read past the 4th character, as will be done when it is an RSDP, reads beyond the bounds of the accessed member. Contributed by jrtc27. Add support for PCC Opregion special context data. PCC Opregion added in ACPIC 6.3 requires special context data similar to GPIO and Generic Serial Bus as it needs to know the internal PCC buffer and its length as well as the PCC channel index when the opregion handler is being executed by the OSPM. Adds support for the special context data needed by PCC Opregion. Submitted by Sudeep Holla 2) iASL Compiler/Disassembler and ACPICA tools: iASL: Completed compiler support for the NHLT ACPI table. iASL/NHLT table: Fixed a reported problem where a fault would occur during disassembly of a "Linux-Specific" section if the "Specific Data" part was not present. iASL: Added full support (compiler and disassembler) for the AGDI ACPI table. Contributed by: Ilkka Koskinen . iASL: Added full support for the TDEL ACPI table. iASL table compiler: FADT support updates: 1) Allow the 32-bit DSDT address to be zero. 2) Issue error if both the 32-bit and 64-bit DSDT addresses are zero. iASL: Fix unaligned accesses to local cache allocations. Contributed by jrtc27. iASL: Open binary input files in binary mode, not text mode Affects binary input AML files, as well as binary data table files, for disassembly. Status: Vendor Tag: intel Release Tags: acpica-20211217 U src/sys/external/bsd/acpica/dist/changes.txt U src/sys/external/bsd/acpica/dist/Makefile U src/sys/external/bsd/acpica/dist/generate/lint/files.lnt U src/sys/external/bsd/acpica/dist/generate/lint/lint.bat U src/sys/external/bsd/acpica/dist/generate/lint/lset.bat U src/sys/external/bsd/acpica/dist/generate/lint/options.lnt U src/sys/external/bsd/acpica/dist/generate/lint/readme.txt U src/sys/external/bsd/acpica/dist/generate/lint/std16.lnt U src/sys/external/bsd/acpica/dist/generate/lint/std32.lnt U src/sys/external/bsd/acpica/dist/generate/lint/std64.lnt U src/sys/external/bsd/acpica/dist/generate/release/build.sh U src/sys/external/bsd/acpica/dist/generate/release/release.sh U src/sys/external/bsd/acpica/dist/generate/unix/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.common U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.config U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.rules U src/sys/external/bsd/acpica/dist/generate/unix/readme.txt U src/sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpiexamples/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpisrc/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpixtract/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/iasl/Makefile U src/sys/external/bsd/acpica/dist/common/acfileio.c U src/sys/external/bsd/acpica/dist/common/acgetline.c U src/sys/external/bsd/acpica/dist/common/adfile.c U src/sys/external/bsd/acpica/dist/common/adisasm.c U src/sys/external/bsd/acpica/dist/common/adwalk.c U src/sys/external/bsd/acpica/dist/common/ahids.c U src/sys/external/bsd/acpica/dist/common/ahpredef.c U src/sys/external/bsd/acpica/dist/common/ahtable.c U src/sys/external/bsd/acpica/dist/common/ahuuids.c U src/sys/external/bsd/acpica/dist/common/cmfsize.c U src/sys/external/bsd/acpica/dist/common/dmextern.c U src/sys/external/bsd/acpica/dist/common/dmrestag.c U src/sys/external/bsd/acpica/dist/common/dmswitch.c U src/sys/external/bsd/acpica/dist/common/dmtable.c U src/sys/external/bsd/acpica/dist/common/dmtables.c C src/sys/external/bsd/acpica/dist/common/dmtbdump.c U src/sys/external/bsd/acpica/dist/common/dmtbdump1.c U src/sys/external/bsd/acpica/dist/common/dmtbdump2.c U src/sys/external/bsd/acpica/dist/common/dmtbdump3.c C src/sys/external/bsd/acpica/dist/common/dmtbinfo.c U src/sys/external/bsd/acpica/dist/common/dmtbinfo1.c U src/sys/external/bsd/acpica/dist/common/dmtbinf
CVS import: src/sys/external/bsd/acpica/dist
Module Name:src Committed By: christos Date: Sat Dec 18 16:18:40 UTC 2021 Update of /cvsroot/src/sys/external/bsd/acpica/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12645 Log Message: Import acpica-20211217 17 December 2021. Summary of changes for version 20211217: This release is available at https://acpica.org/downloads 1) ACPICA kernel-resident subsystem: Hardware: Do not flush CPU cache when entering S4 and S5. According to ACPI 6.4, Section 16.2, the CPU cache flushing is required on entering to S1, S2, and S3, but the ACPICA code flushes the CPU cache regardless of the sleep state. Blind cache flush on entering S5 causes problems for TDX. Avoid subobject buffer overflow when validating RSDP signature. Since the Signature member is accessed through an ACPI_TABLE_HEADER, the pointer to it is only to a 4-char array, and so trying to read past the 4th character, as will be done when it is an RSDP, reads beyond the bounds of the accessed member. Contributed by jrtc27. Add support for PCC Opregion special context data. PCC Opregion added in ACPIC 6.3 requires special context data similar to GPIO and Generic Serial Bus as it needs to know the internal PCC buffer and its length as well as the PCC channel index when the opregion handler is being executed by the OSPM. Adds support for the special context data needed by PCC Opregion. Submitted by Sudeep Holla 2) iASL Compiler/Disassembler and ACPICA tools: iASL: Completed compiler support for the NHLT ACPI table. iASL/NHLT table: Fixed a reported problem where a fault would occur during disassembly of a "Linux-Specific" section if the "Specific Data" part was not present. iASL: Added full support (compiler and disassembler) for the AGDI ACPI table. Contributed by: Ilkka Koskinen . iASL: Added full support for the TDEL ACPI table. iASL table compiler: FADT support updates: 1) Allow the 32-bit DSDT address to be zero. 2) Issue error if both the 32-bit and 64-bit DSDT addresses are zero. iASL: Fix unaligned accesses to local cache allocations. Contributed by jrtc27. iASL: Open binary input files in binary mode, not text mode Affects binary input AML files, as well as binary data table files, for disassembly. Status: Vendor Tag: intel Release Tags: acpica-20211217 U src/sys/external/bsd/acpica/dist/changes.txt U src/sys/external/bsd/acpica/dist/Makefile U src/sys/external/bsd/acpica/dist/generate/lint/files.lnt U src/sys/external/bsd/acpica/dist/generate/lint/lint.bat U src/sys/external/bsd/acpica/dist/generate/lint/lset.bat U src/sys/external/bsd/acpica/dist/generate/lint/options.lnt U src/sys/external/bsd/acpica/dist/generate/lint/readme.txt U src/sys/external/bsd/acpica/dist/generate/lint/std16.lnt U src/sys/external/bsd/acpica/dist/generate/lint/std32.lnt U src/sys/external/bsd/acpica/dist/generate/lint/std64.lnt U src/sys/external/bsd/acpica/dist/generate/release/build.sh U src/sys/external/bsd/acpica/dist/generate/release/release.sh U src/sys/external/bsd/acpica/dist/generate/unix/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.common U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.config U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.rules U src/sys/external/bsd/acpica/dist/generate/unix/readme.txt U src/sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpiexamples/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpisrc/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpixtract/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/iasl/Makefile U src/sys/external/bsd/acpica/dist/common/acfileio.c U src/sys/external/bsd/acpica/dist/common/acgetline.c U src/sys/external/bsd/acpica/dist/common/adfile.c U src/sys/external/bsd/acpica/dist/common/adisasm.c U src/sys/external/bsd/acpica/dist/common/adwalk.c U src/sys/external/bsd/acpica/dist/common/ahids.c U src/sys/external/bsd/acpica/dist/common/ahpredef.c U src/sys/external/bsd/acpica/dist/common/ahtable.c U src/sys/external/bsd/acpica/dist/common/ahuuids.c U src/sys/external/bsd/acpica/dist/common/cmfsize.c U src/sys/external/bsd/acpica/dist/common/dmextern.c U src/sys/external/bsd/acpica/dist/common/dmrestag.c U src/sys/external/bsd/acpica/dist/common/dmswitch.c U src/sys/external/bsd/acpica/dist/common/dmtable.c U src/sys/external/bsd/acpica/dist/common/dmtables.c C src/sys/external/bsd/acpica/dist/common/dmtbdump.c U src/sys/external/bsd/acpica/dist/common/dmtbdump1.c U src/sys/external/bsd/acpica/dist/common/dmtbdump2.c U src/sys/external/bsd/acpica/dist/common/dmtbdump3.c C src/sys/external/bsd/acpica/dist/common/dmtbinfo.c U src/sys/external/bsd/acpica/dist/common/dmtbinfo1.c U src/sys/external/bsd/acpica/dist/common/dmtbinf
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: riastradh Date: Sat Dec 18 16:31:06 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: files.generic Log Message: arm: Need files.acpi for drm to discover NACPICA=0. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/files.generic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: riastradh Date: Sat Dec 18 16:31:06 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: files.generic Log Message: arm: Need files.acpi for drm to discover NACPICA=0. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/files.generic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/files.generic diff -u src/sys/arch/evbarm/conf/files.generic:1.12 src/sys/arch/evbarm/conf/files.generic:1.13 --- src/sys/arch/evbarm/conf/files.generic:1.12 Fri Nov 12 22:02:08 2021 +++ src/sys/arch/evbarm/conf/files.generic Sat Dec 18 16:31:06 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.generic,v 1.12 2021/11/12 22:02:08 jmcneill Exp $ +# $NetBSD: files.generic,v 1.13 2021/12/18 16:31:06 riastradh Exp $ # # A generic (aarch32) kernel configuration info # @@ -17,6 +17,7 @@ file arch/arm/arm/arm_generic_dma.c file arch/arm/arm/bus_space_a4x.S # Add other board files here +include "arch/arm/acpi/files.acpi" include "arch/arm/altera/files.altera" include "arch/arm/amlogic/files.meson" include "arch/arm/broadcom/files.bcm2835"
CVS commit: src/sys/sys
Module Name:src Committed By: riastradh Date: Sat Dec 18 16:31:40 UTC 2021 Modified Files: src/sys/sys: atomic.h Log Message: CTASSERT requires . To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/sys/atomic.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: riastradh Date: Sat Dec 18 16:31:40 UTC 2021 Modified Files: src/sys/sys: atomic.h Log Message: CTASSERT requires . To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/sys/atomic.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/atomic.h diff -u src/sys/sys/atomic.h:1.21 src/sys/sys/atomic.h:1.22 --- src/sys/sys/atomic.h:1.21 Tue Dec 3 04:57:38 2019 +++ src/sys/sys/atomic.h Sat Dec 18 16:31:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.21 2019/12/03 04:57:38 riastradh Exp $ */ +/* $NetBSD: atomic.h,v 1.22 2021/12/18 16:31:40 riastradh Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -391,6 +391,8 @@ __END_DECLS #include +#include + #ifdef _LP64 #define __HAVE_ATOMIC64_LOADSTORE 1 #define __ATOMIC_SIZE_MAX 8
CVS commit: src/sys/uvm
Module Name:src Committed By: riastradh Date: Sat Dec 18 16:31:53 UTC 2021 Modified Files: src/sys/uvm: uvm_device.h Log Message: Add some missing includes to uvm_device.h. - sys/types.h for dev_t - sys/queue.h for LIST_ENTRY - uvm/uvm_object.h for complete struct uvm_object type - uvm/uvm_param.h for voff_t/vsize_t - uvm/uvm_prot.h for vm_prot_t To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/uvm/uvm_device.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src Committed By: riastradh Date: Sat Dec 18 16:31:53 UTC 2021 Modified Files: src/sys/uvm: uvm_device.h Log Message: Add some missing includes to uvm_device.h. - sys/types.h for dev_t - sys/queue.h for LIST_ENTRY - uvm/uvm_object.h for complete struct uvm_object type - uvm/uvm_param.h for voff_t/vsize_t - uvm/uvm_prot.h for vm_prot_t To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/uvm/uvm_device.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/uvm/uvm_device.h diff -u src/sys/uvm/uvm_device.h:1.14 src/sys/uvm/uvm_device.h:1.15 --- src/sys/uvm/uvm_device.h:1.14 Sat Sep 5 16:30:13 2020 +++ src/sys/uvm/uvm_device.h Sat Dec 18 16:31:53 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_device.h,v 1.14 2020/09/05 16:30:13 riastradh Exp $ */ +/* $NetBSD: uvm_device.h,v 1.15 2021/12/18 16:31:53 riastradh Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -30,6 +30,13 @@ #ifndef _UVM_UVM_DEVICE_H_ #define _UVM_UVM_DEVICE_H_ +#include +#include + +#include +#include +#include + /* * uvm_device.h *
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: riastradh Date: Sat Dec 18 16:41:37 UTC 2021 Modified Files: src/sys/arch/arm/include: cpu.h Log Message: arm: Forward-declare `struct proc' before using in prototype. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/arch/arm/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/cpu.h diff -u src/sys/arch/arm/include/cpu.h:1.121 src/sys/arch/arm/include/cpu.h:1.122 --- src/sys/arch/arm/include/cpu.h:1.121 Mon Nov 1 14:45:24 2021 +++ src/sys/arch/arm/include/cpu.h Sat Dec 18 16:41:37 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.121 2021/11/01 14:45:24 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.122 2021/12/18 16:41:37 riastradh Exp $ */ /* * Copyright (c) 1994-1996 Mark Brinicombe. @@ -67,6 +67,8 @@ void cpu_set_hatched(int); #endif +struct proc; + void cpu_proc_fork(struct proc *, struct proc *); #endif /* !_LOCORE */
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: riastradh Date: Sat Dec 18 16:41:37 UTC 2021 Modified Files: src/sys/arch/arm/include: cpu.h Log Message: arm: Forward-declare `struct proc' before using in prototype. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/arch/arm/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/acpica/dist
Module Name:src Committed By: christos Date: Sat Dec 18 17:58:49 UTC 2021 Modified Files: src/sys/external/bsd/acpica/dist/common: dmtbinfo.c src/sys/external/bsd/acpica/dist/compiler: aslfiles.c aslutils.c dttable.c dtutils.c src/sys/external/bsd/acpica/dist/dispatcher: dsopcode.c src/sys/external/bsd/acpica/dist/events: evregion.c evrgnini.c src/sys/external/bsd/acpica/dist/executer: exconfig.c exdebug.c src/sys/external/bsd/acpica/dist/include: acapps.h acdisasm.h acpixf.h actables.h actypes.h src/sys/external/bsd/acpica/dist/resources: rsdumpinfo.c src/sys/external/bsd/acpica/dist/tables: tbdata.c tbfadt.c tbinstal.c tbutils.c tbxfload.c src/sys/external/bsd/acpica/dist/utilities: utdelete.c Log Message: merge changes from acpica-20210930 to acpica-20211217 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c cvs rdiff -u -r1.17 -r1.18 \ src/sys/external/bsd/acpica/dist/compiler/aslfiles.c cvs rdiff -u -r1.30 -r1.31 \ src/sys/external/bsd/acpica/dist/compiler/aslutils.c cvs rdiff -u -r1.15 -r1.16 \ src/sys/external/bsd/acpica/dist/compiler/dttable.c cvs rdiff -u -r1.18 -r1.19 \ src/sys/external/bsd/acpica/dist/compiler/dtutils.c cvs rdiff -u -r1.16 -r1.17 \ src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/events/evregion.c cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/events/evrgnini.c cvs rdiff -u -r1.17 -r1.18 \ src/sys/external/bsd/acpica/dist/executer/exconfig.c cvs rdiff -u -r1.14 -r1.15 \ src/sys/external/bsd/acpica/dist/executer/exdebug.c cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/acpica/dist/include/acapps.h cvs rdiff -u -r1.23 -r1.24 \ src/sys/external/bsd/acpica/dist/include/acdisasm.h cvs rdiff -u -r1.31 -r1.32 src/sys/external/bsd/acpica/dist/include/acpixf.h cvs rdiff -u -r1.15 -r1.16 \ src/sys/external/bsd/acpica/dist/include/actables.h cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/acpica/dist/include/actypes.h cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/tables/tbdata.c \ src/sys/external/bsd/acpica/dist/tables/tbfadt.c \ src/sys/external/bsd/acpica/dist/tables/tbinstal.c cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/tables/tbutils.c cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/tables/tbxfload.c cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/acpica/dist/utilities/utdelete.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/acpica/dist
Module Name:src
Committed By: christos
Date: Sat Dec 18 17:58:49 UTC 2021
Modified Files:
src/sys/external/bsd/acpica/dist/common: dmtbinfo.c
src/sys/external/bsd/acpica/dist/compiler: aslfiles.c aslutils.c
dttable.c dtutils.c
src/sys/external/bsd/acpica/dist/dispatcher: dsopcode.c
src/sys/external/bsd/acpica/dist/events: evregion.c evrgnini.c
src/sys/external/bsd/acpica/dist/executer: exconfig.c exdebug.c
src/sys/external/bsd/acpica/dist/include: acapps.h acdisasm.h acpixf.h
actables.h actypes.h
src/sys/external/bsd/acpica/dist/resources: rsdumpinfo.c
src/sys/external/bsd/acpica/dist/tables: tbdata.c tbfadt.c tbinstal.c
tbutils.c tbxfload.c
src/sys/external/bsd/acpica/dist/utilities: utdelete.c
Log Message:
merge changes from acpica-20210930 to acpica-20211217
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/compiler/aslfiles.c
cvs rdiff -u -r1.30 -r1.31 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/compiler/dttable.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/events/evregion.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/events/evrgnini.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/executer/exconfig.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/executer/exdebug.c
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/acpica/dist/include/acapps.h
cvs rdiff -u -r1.23 -r1.24 \
src/sys/external/bsd/acpica/dist/include/acdisasm.h
cvs rdiff -u -r1.31 -r1.32 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/include/actables.h
cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/tables/tbdata.c \
src/sys/external/bsd/acpica/dist/tables/tbfadt.c \
src/sys/external/bsd/acpica/dist/tables/tbinstal.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/tables/tbutils.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/tables/tbxfload.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/acpica/dist/utilities/utdelete.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/acpica/dist/common/dmtbinfo.c
diff -u src/sys/external/bsd/acpica/dist/common/dmtbinfo.c:1.19 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c:1.20
--- src/sys/external/bsd/acpica/dist/common/dmtbinfo.c:1.19 Sat Apr 3 13:45:02 2021
+++ src/sys/external/bsd/acpica/dist/common/dmtbinfo.c Sat Dec 18 12:58:48 2021
@@ -184,7 +184,7 @@ ACPI_DMTABLE_INFO AcpiDmTableI
ACPI_DMTABLE_INFO AcpiDmTableInfoFadt1[] =
{
{ACPI_DMT_UINT32, ACPI_FADT_OFFSET (Facs),"FACS Address", 0},
-{ACPI_DMT_UINT32, ACPI_FADT_OFFSET (Dsdt),"DSDT Address", DT_NON_ZERO},
+{ACPI_DMT_UINT32, ACPI_FADT_OFFSET (Dsdt),"DSDT Address", 0},
{ACPI_DMT_UINT8,ACPI_FADT_OFFSET (Model), "Model", 0},
{ACPI_DMT_FADTPM, ACPI_FADT_OFFSET (PreferredProfile),"PM Profile", 0},
{ACPI_DMT_UINT16, ACPI_FADT_OFFSET (SciInterrupt),"SCI Interrupt", 0},
@@ -300,7 +300,7 @@ ACPI_DMTABLE_INFO AcpiDmTableI
ACPI_DMT_TERMINATOR
};
-/* ACPI 5.0 Extensions (FADT version 5) */
+/* Extensions for FADT version 5 */
ACPI_DMTABLE_INFO AcpiDmTableInfoFadt5[] =
{
@@ -309,7 +309,7 @@ ACPI_DMTABLE_INFO AcpiDmTableI
ACPI_DMT_TERMINATOR
};
-/* ACPI 6.0 Extensions (FADT version 6) */
+/* Extensions for FADT version 6 */
ACPI_DMTABLE_INFO AcpiDmTableInfoFadt6[] =
{
Index: src/sys/external/bsd/acpica/dist/compiler/aslfiles.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslfiles.c:1.17 src/sys/external/bsd/acpica/dist/compiler/aslfiles.c:1.18
--- src/sys/external/bsd/acpica/dist/compiler/aslfiles.c:1.17 Sat Apr 3 13:45:02 2021
+++ src/sys/external/bsd/acpica/dist/compiler/aslfiles.c Sat Dec 18 12:58:48 2021
@@ -727,8 +727,8 @@ ErrorExit:
* RETURN: Status
*
* DESCRIPTION: Open the specified input file, and save the directory path to
- * the file so that include files can be opened in
- * the same directory.
+ * the file so that include files can be opened in the same
+ * directory. NOTE: File is opened in
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Dec 18 18:05:55 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new acpica To generate a diff of this commit: cvs rdiff -u -r1.1827 -r1.1828 src/doc/3RDPARTY cvs rdiff -u -r1.2853 -r1.2854 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Dec 18 18:05:55 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new acpica To generate a diff of this commit: cvs rdiff -u -r1.1827 -r1.1828 src/doc/3RDPARTY cvs rdiff -u -r1.2853 -r1.2854 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1827 src/doc/3RDPARTY:1.1828 --- src/doc/3RDPARTY:1.1827 Sun Nov 28 04:14:21 2021 +++ src/doc/3RDPARTY Sat Dec 18 13:05:55 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1827 2021/11/28 09:14:21 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1828 2021/12/18 18:05:55 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -41,8 +41,8 @@ # Package: acpica -Version: 20210930 -Current Vers: 20210930 +Version: 20211217 +Current Vers: 20211217 Maintainer: Intel Archive Site: http://www.acpica.org/downloads/ Home Page: http://www.acpica.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2853 src/doc/CHANGES:1.2854 --- src/doc/CHANGES:1.2853 Tue Dec 7 12:50:27 2021 +++ src/doc/CHANGES Sat Dec 18 13:05:55 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2853 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2854 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -459,3 +459,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: aarch64: Add initial COMPAT_LINUX32 support. [ryo 20211125] scmd: Driver and userland utility for the Sparkfun Serial Controlled Motor Driver [brad 20211207] + acpi(4): Updated ACPICA to 20211217. [christos 20211218]
Re: CVS import: src/sys/external/bsd/drm2/dist
"Taylor R Campbell" >Update of /cvsroot/src/sys/external/bsd/drm2/dist >In directory ivanova.netbsd.org:/tmp/cvs-serv344 > >Log Message: >Import drm from Linux v5.6-rc3 (commit >f8788d86ab28f61f7b46eb6be375f8a726783636) > >drivers/gpu/drm -> sys/external/bsd/drm2/dist/drm >include/drm -> sys/external/bsd/drm2/dist/include/drm >include/uapi/drm-> sys/external/bsd/drm2/dist/include/uapi/drm > >GPL exclusions in dist/drm: > >- lima/ > >GPL exclusions in dist/include/uapi/drm: > >- lima_drm.h Almost all of the lima files are dual licenced, is there a reason why they can't be imported as well? What do you want to do with GPL only ones? We could have a tree to mirror the bsd one in sys/external/gpl2/drm2/dist.
Re: CVS import: src/sys/external/bsd/drm2/dist
> Date: Sat, 18 Dec 2021 21:02:52 + > From: Robert Swindells > > Almost all of the lima files are dual licenced, is there a reason why > they can't be imported as well? Probably an oversight, wasn't paying that close attention to those at the time I started this import (a while ago now). Will review after the merge is complete. > What do you want to do with GPL only ones? We could have a tree to > mirror the bsd one in sys/external/gpl2/drm2/dist. Can put them there, but they will need to be optionally loadable modules, which means we'll have to fix genfb so it can be used from modules, all of which has to wait until the merge is complete.
CVS commit: src/sys/external/bsd/drm2/dist
Module Name:src Committed By: riastradh Date: Sat Dec 18 23:54:51 UTC 2021 Added Files: src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_gem_cma_helper.h Log Message: drm: Temporarily restore some local files deleted upstream. These had local changes which needed to be distributed into other files upstream, but that didn't happen in the merge commit. It will happen, and the files will be deleted, in a later commit. To generate a diff of this commit: cvs rdiff -u -r0 -r1.33 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c cvs rdiff -u -r0 -r1.43 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r0 -r1.8 \ src/sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist
Module Name:src
Committed By: riastradh
Date: Sat Dec 18 23:54:51 UTC 2021
Added Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_gem_cma_helper.h
Log Message:
drm: Temporarily restore some local files deleted upstream.
These had local changes which needed to be distributed into other
files upstream, but that didn't happen in the merge commit. It will
happen, and the files will be deleted, in a later commit.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.33 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
cvs rdiff -u -r0 -r1.43 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r0 -r1.8 \
src/sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
diff -u /dev/null src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.33
--- /dev/null Sat Dec 18 23:54:51 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Sat Dec 18 23:54:51 2021
@@ -0,0 +1,1423 @@
+/* $NetBSD: i915_dma.c,v 1.33 2021/12/18 23:54:51 riastradh Exp $ */
+
+/* i915_dma.c -- DMA support for the I915 -*- linux-c -*-
+ */
+/*
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: i915_dma.c,v 1.33 2021/12/18 23:54:51 riastradh Exp $");
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include
+#include
+#include
+#include
+#include
+#include "intel_drv.h"
+#include
+#include "i915_drv.h"
+#include "i915_vgpu.h"
+#include "i915_trace.h"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+static int i915_getparam(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ drm_i915_getparam_t *param = data;
+ int value;
+
+ switch (param->param) {
+ case I915_PARAM_IRQ_ACTIVE:
+ case I915_PARAM_ALLOW_BATCHBUFFER:
+ case I915_PARAM_LAST_DISPATCH:
+ /* Reject all old ums/dri params. */
+ return -ENODEV;
+ case I915_PARAM_CHIPSET_ID:
+ value = dev->pdev->device;
+ break;
+ case I915_PARAM_REVISION:
+ value = dev->pdev->revision;
+ break;
+ case I915_PARAM_HAS_GEM:
+ value = 1;
+ break;
+ case I915_PARAM_NUM_FENCES_AVAIL:
+ value = dev_priv->num_fence_regs;
+ break;
+ case I915_PARAM_HAS_OVERLAY:
+ value = dev_priv->overlay ? 1 : 0;
+ break;
+ case I915_PARAM_HAS_PAGEFLIPPING:
+ value = 1;
+ break;
+ case I915_PARAM_HAS_EXECBUF2:
+ /* depends on GEM */
+ value = 1;
+ break;
+ case I915_PARAM_HAS_BSD:
+ value = intel_ring_initialized(&dev_priv->ring[VCS]);
+ break;
+ case I915_PARAM_HAS_BLT:
+ value = intel_ring_initialized(&dev_priv->ring[BCS]);
+ break;
+ case I915_PARAM_HAS_VEBOX:
+ value = intel_ring_initialized(&dev_priv->ring[VECS]);
+ break;
+ case I915_PARAM_HAS_BSD2:
+ value = intel_ring_initialized(&dev_priv->ring[VCS2]);
+ break;
+ case I915_PARAM_HAS_RELAXED_FENCING:
+ value = 1;
+ break;
+ case I915_PARAM_HAS_COHERENT_RINGS:
+ value = 1;
+ break;
+ case I915_PARAM_HAS_EXEC_CONSTANTS:
+ value = INTEL_INFO(dev)->gen >= 4;
+ break;
+ case I915_PARAM_HAS_RELAXED_DELTA:
+ value = 1;
+ break;
+ case I915_PARAM_HAS_GEN7_SOL_RESET:
+ value = 1;
+ break;
+ case I915_PARAM_HAS_LLC:
+ value = HAS_LLC(dev);
+ break;
+ case I915_PARAM_HAS_WT:
+ value = HAS_WT(dev);
+ break;
+ case I915_PARAM_HAS_ALIASING_PPGTT:
+ value = USES_PPGTT(dev);
+ break;
+ case I915_PARAM_HAS_WAIT_TIMEOUT:
+ value = 1;
+ break;
+ case I915_PARAM_HAS_SEMAPHORES:
+ value = i915_semaphore_is_enabled(dev);
+ break;
+ case I915_PARAM_HAS_PRIME_VMAP
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:05 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_uvd_v4_2.c amdgpu_uvd_v5_0.c amdgpu_uvd_v6_0.c src/sys/external/bsd/drm2/dist/drm/radeon: radeon_uvd_v1_0.c src/sys/external/bsd/drm2/dist/drm/vmwgfx: vmwgfx_drv.h Log Message: 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.) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_drv.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:05 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_uvd_v4_2.c amdgpu_uvd_v5_0.c amdgpu_uvd_v6_0.c src/sys/external/bsd/drm2/dist/drm/radeon: radeon_uvd_v1_0.c src/sys/external/bsd/drm2/dist/drm/vmwgfx: vmwgfx_drv.h Log Message: 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.) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_drv.h 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/amd/amdgpu/amdgpu_uvd_v4_2.c diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c:1.5 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c:1.6 --- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c:1.5 Sat Dec 18 23:44:58 2021 +++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c Sun Dec 19 00:25:04 2021 @@ -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 -__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 @@ -279,7 +279,7 @@ static int uvd_v4_2_start(struct amdgpu_ /* 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 @@ static int uvd_v4_2_start(struct amdgpu_ return r; } - /* enable interrupt */ + /* enable interupt */ WREG32_P(mmUVD_MASTINT_EN, 3<<1, ~(3 << 1)); WREG32_P(mmUVD_STATUS, 0, ~(1<<2)); Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c:1.5 --- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c:1.4 Sat Dec 18 23:44:58 2021 +++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c Sun Dec 19 00:25:04 2021 @@ -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 -__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 #include @@ -311,7 +311,7 @@ static int uvd_v5_0_start(struct amdgpu_ 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 */ Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c:1.5 --- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c:1.4 Sat Dec 18 23:44:58 2021 +++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c Sun Dec 19 00:25:04 2021 @@ -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 -__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 @@ -718,7 +718,7 @@ static int uvd_v6_0_start(struct amdgpu_ 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 */ Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c:1.6 ---
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:13 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm2netbsd Log Message: Set CONFIG_DRM_VM=1, apparently needed for nouveau now. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drm2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:13 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm2netbsd Log Message: Set CONFIG_DRM_VM=1, apparently needed for nouveau now. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drm2netbsd 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/drm/drm2netbsd diff -u src/sys/external/bsd/drm2/drm/drm2netbsd:1.2 src/sys/external/bsd/drm2/drm/drm2netbsd:1.3 --- src/sys/external/bsd/drm2/drm/drm2netbsd:1.2 Mon Aug 27 07:54:28 2018 +++ src/sys/external/bsd/drm2/drm/drm2netbsd Sun Dec 19 00:25:13 2021 @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: drm2netbsd,v 1.2 2018/08/27 07:54:28 riastradh Exp $ +# $NetBSD: drm2netbsd,v 1.3 2021/12/19 00:25:13 riastradh Exp $ # # $ /path/to/drm2netbsd > /path/to/files.drm.new # @@ -17,6 +17,7 @@ drmkms_flag=drmkms env CONFIG_PCI=y \ env CONFIG_AGP=y \ env CONFIG_DRM_FBDEV_EMULATION=y \ +env CONFIG_DRM_VM=y \ make -f Makefile -V '$(drm-y)' -V '$(drm_kms_helper-y)' \ | tr ' ' '\n' \ | grep -v '^$' \
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:20 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915drmkms2netbsd Log Message: Break down and use gmake for i915drmkms2netbsd too. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:25:20 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915drmkms2netbsd
Log Message:
Break down and use gmake for i915drmkms2netbsd too.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd
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/i915drm/i915drmkms2netbsd
diff -u src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd:1.2 src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd:1.3
--- src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd:1.2 Mon Aug 27 07:55:17 2018
+++ src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd Sun Dec 19 00:25:19 2021
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: i915drmkms2netbsd,v 1.2 2018/08/27 07:55:17 riastradh Exp $
+# $NetBSD: i915drmkms2netbsd,v 1.3 2021/12/19 00:25:19 riastradh Exp $
#
# $ /path/to/i915drmkms2netbsd > /path/to/files.i915drmkms.new
#
@@ -8,16 +8,23 @@
set -Ceu
+: ${GMAKE:=gmake}
+
# Location of the i915drmkms sources relative to $NETBSDSRCDIR.
i915drmkms_top=external/bsd/drm2/dist/drm/i915
# config(5) flag for the i915drmkms driver.
i915drmkms_flag=i915drmkms
-env CONFIG_ACPI=y \
-env CONFIG_DRM_FBDEV_EMULATION=y \
-env src=. \
-make -f Makefile -V '$(i915-y)' \
+{
+ printf 'show-i915-y:\n'
+ printf '\t@echo $(i915-y)\n'
+ printf 'include Makefile\n'
+} | env \
+ env CONFIG_ACPI=y \
+ env CONFIG_DRM_FBDEV_EMULATION=y \
+ env src=. \
+ ${GMAKE} -f - -s show-i915-y \
| tr ' ' '\n' \
| grep -v '^$' \
| sed -e 's,\.o$,.c,' \
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:26 UTC 2021 Modified Files: src/sys/external/bsd/drm2/radeon: radeon2netbsd Log Message: Handle more kinds of empty lines. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/radeon/radeon2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:26 UTC 2021 Modified Files: src/sys/external/bsd/drm2/radeon: radeon2netbsd Log Message: Handle more kinds of empty lines. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/radeon/radeon2netbsd 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/radeon/radeon2netbsd diff -u src/sys/external/bsd/drm2/radeon/radeon2netbsd:1.2 src/sys/external/bsd/drm2/radeon/radeon2netbsd:1.3 --- src/sys/external/bsd/drm2/radeon/radeon2netbsd:1.2 Mon Aug 27 14:38:20 2018 +++ src/sys/external/bsd/drm2/radeon/radeon2netbsd Sun Dec 19 00:25:26 2021 @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: radeon2netbsd,v 1.2 2018/08/27 14:38:20 riastradh Exp $ +# $NetBSD: radeon2netbsd,v 1.3 2021/12/19 00:25:26 riastradh Exp $ # # $ /path/to/radeon2netbsd > /path/to/files.radeon.new # @@ -20,7 +20,7 @@ env CONFIG_ACPI=y \ env src=. \ make -f Makefile -V '$(radeon-y)' \ | tr ' ' '\n' \ -| grep -v '^$' \ +| grep -v -e '^[[:space:]]*$' \ | sed -e 's,\.o$,.c,' \ | sort -u \ | awk '
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:35 UTC 2021 Modified Files: src/sys/external/bsd/drm2/amdgpu: files.amdgpu src/sys/external/bsd/drm2/drm: files.drmkms src/sys/external/bsd/drm2/i915drm: files.i915drmkms src/sys/external/bsd/drm2/nouveau: files.nouveau src/sys/external/bsd/drm2/radeon: files.radeon Log Message: Generate files.* using the 2netbsd scripts. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/amdgpu/files.amdgpu cvs rdiff -u -r1.35 -r1.36 src/sys/external/bsd/drm2/drm/files.drmkms cvs rdiff -u -r1.41 -r1.42 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/nouveau/files.nouveau cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/radeon/files.radeon Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:35 UTC 2021 Modified Files: src/sys/external/bsd/drm2/amdgpu: files.amdgpu src/sys/external/bsd/drm2/drm: files.drmkms src/sys/external/bsd/drm2/i915drm: files.i915drmkms src/sys/external/bsd/drm2/nouveau: files.nouveau src/sys/external/bsd/drm2/radeon: files.radeon Log Message: Generate files.* using the 2netbsd scripts. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/amdgpu/files.amdgpu cvs rdiff -u -r1.35 -r1.36 src/sys/external/bsd/drm2/drm/files.drmkms cvs rdiff -u -r1.41 -r1.42 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/nouveau/files.nouveau cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/radeon/files.radeon 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/amdgpu/files.amdgpu diff -u src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.8 src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.9 --- src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.8 Fri Feb 14 04:30:04 2020 +++ src/sys/external/bsd/drm2/amdgpu/files.amdgpu Sun Dec 19 00:25:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.amdgpu,v 1.8 2020/02/14 04:30:04 riastradh Exp $ +# $NetBSD: files.amdgpu,v 1.9 2021/12/19 00:25:34 riastradh Exp $ version 20180827 @@ -27,87 +27,330 @@ file external/bsd/drm2/amdgpu/amdgpu_pci file external/bsd/drm2/amdgpu/amdgpufb.c amdgpufb # Generated from amdgpu2netbsd. -file external/bsd/drm2/dist/drm/amd/amdgpu/../scheduler/amdgpu_gpu_scheduler.c amdgpu -file external/bsd/drm2/dist/drm/amd/amdgpu/../scheduler/amdgpu_sched_fence.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../acp/amdgpu_acp_hw.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_color.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_helpers.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_irq.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_pp_smu.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_services.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/amdgpu_dc_dmub_srv.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/amdgpu_dc_helper.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/basics/amdgpu_conversion.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/basics/amdgpu_dc_common.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/basics/amdgpu_fixpt31_32.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/basics/amdgpu_log_helpers.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/basics/amdgpu_vector.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/amdgpu_bios_parser.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/amdgpu_bios_parser2.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/amdgpu_bios_parser_common.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/amdgpu_bios_parser_helper.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/amdgpu_bios_parser_interface.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/amdgpu_command_table.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/amdgpu_command_table2.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/amdgpu_command_table_helper.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/amdgpu_command_table_helper2.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/dce110/amdgpu_command_table_helper_dce110.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/dce112/amdgpu_command_table_helper2_dce112.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/dce112/amdgpu_command_table_helper_dce112.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/bios/dce80/amdgpu_command_table_helper_dce80.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/calcs/amdgpu_bw_fixed.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/calcs/amdgpu_custom_float.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/calcs/amdgpu_dce_calcs.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/clk_mgr/amdgpu_clk_mgr.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/clk_mgr/dce100/amdgpu_dce_clk_mgr.c amdgpu +file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/clk_mgr/dce11
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: dma-mapping.h Log Message: Allow maximum number of bits in DMA_BIT_MASK. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/include/linux/dma-mapping.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:25:41 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: dma-mapping.h
Log Message:
Allow maximum number of bits in DMA_BIT_MASK.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/include/linux/dma-mapping.h
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/include/linux/dma-mapping.h
diff -u src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.5 src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.6
--- src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.5 Mon Aug 27 06:17:40 2018
+++ src/sys/external/bsd/drm2/include/linux/dma-mapping.h Sun Dec 19 00:25:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dma-mapping.h,v 1.5 2018/08/27 06:17:40 riastradh Exp $ */
+/* $NetBSD: dma-mapping.h,v 1.6 2021/12/19 00:25:41 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,12 +34,16 @@
#include
+#include
+
typedef bus_addr_t dma_addr_t;
static inline uintmax_t
DMA_BIT_MASK(unsigned nbits)
{
+ if (nbits == CHAR_BIT*sizeof(uintmax_t))
+ return ~(uintmax_t)0;
return ~(~(uintmax_t)0 << nbits);
}
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:53 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Added Files: src/sys/external/bsd/drm2/drm: drm_gem_framebuffer_helper.c Log Message: Local reimplementation of GPL drm_gem_framebuffer_helper.c. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_helper.c cvs rdiff -u -r1.36 -r1.37 src/sys/external/bsd/drm2/drm/files.drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:25:53 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
Added Files:
src/sys/external/bsd/drm2/drm: drm_gem_framebuffer_helper.c
Log Message:
Local reimplementation of GPL drm_gem_framebuffer_helper.c.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_helper.c
cvs rdiff -u -r1.36 -r1.37 src/sys/external/bsd/drm2/drm/files.drmkms
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/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.36 src/sys/external/bsd/drm2/drm/files.drmkms:1.37
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.36 Sun Dec 19 00:25:34 2021
+++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 00:25:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.36 2021/12/19 00:25:34 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.37 2021/12/19 00:25:53 riastradh Exp $
include "external/bsd/drm2/linux/files.drmkms_linux"
@@ -96,7 +96,6 @@ file external/bsd/drm2/dist/drm/drm_form
file external/bsd/drm2/dist/drm/drm_fourcc.c drmkms
file external/bsd/drm2/dist/drm/drm_framebuffer.c drmkms
file external/bsd/drm2/dist/drm/drm_gem.c drmkms
-file external/bsd/drm2/dist/drm/drm_gem_framebuffer_helper.c drmkms
file external/bsd/drm2/dist/drm/drm_hashtab.c drmkms
file external/bsd/drm2/dist/drm/drm_hdcp.c drmkms
file external/bsd/drm2/dist/drm/drm_ioctl.c drmkms
@@ -129,6 +128,7 @@ file external/bsd/drm2/dist/drm/drm_vm.c
file external/bsd/drm2/dist/drm/drm_writeback.c drmkms
file external/bsd/drm2/drm/drm_cache.c drmkms
file external/bsd/drm2/drm/drm_fops.c drmkms
+file external/bsd/drm2/drm/drm_gem_framebuffer_helper.c drmkms
file external/bsd/drm2/drm/drm_lock.c drmkms
file external/bsd/drm2/drm/drm_memory.c drmkms
file external/bsd/drm2/drm/drm_scatter.c drmkms
Added files:
Index: src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_helper.c
diff -u /dev/null src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_helper.c:1.1
--- /dev/null Sun Dec 19 00:25:53 2021
+++ src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_helper.c Sun Dec 19 00:25:53 2021
@@ -0,0 +1,157 @@
+/* $NetBSD: drm_gem_framebuffer_helper.c,v 1.1 2021/12/19 00:25:53 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: drm_gem_framebuffer_helper.c,v 1.1 2021/12/19 00:25:53 riastradh Exp $");
+
+#include
+#include
+
+#include
+#include
+
+#include
+
+/*
+ * drm_gem_fb_destroy(fb)
+ *
+ * Release the objects in, clean up and, kfree a framebuffer
+ * allocated with drm_gem_fb_create_with_funcs.
+ *
+ * Fit for use as struct drm_framebuffer_funcs::destroy. Caller
+ * must guarantee that the struct drm_framebuffer is allocated
+ * with kmalloc.
+ */
+void
+drm_gem_fb_destroy(struct drm_framebuffer *fb)
+{
+ unsigned plane;
+
+ for (plane = 0; plane < __arraycount(fb->obj); plane++)
+ drm_gem_object_put_unlocked(fb->obj[plane]);
+ drm_framebuffer_cleanup(fb);
+ kfree(fb);
+}
+
+/*
+ * drm_gem_fb_create_handle(fb, file, handlep)
+ *
+ * Create a GEM handle for the object of the first plane (plane=0)
+ * of fb in the specified drm file namespace, and store it in
+ * *handlep.
+ *
+ * Returns 0 on success, negative error on failure.
+ */
+int
+drm_gem_fb_create_handle(struct drm_framebuffer *fb, struct drm_file *file,
+u
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:26:09 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Added Files: src/sys/external/bsd/drm2/drm: drm_lease.c src/sys/external/bsd/drm2/include/drm: drm_lease.h Log Message: Unfinished local implementation of GPL drm_lease.c. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/drm/drm_lease.c cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/drm2/drm/files.drmkms cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/drm/drm_lease.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:26:09 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
Added Files:
src/sys/external/bsd/drm2/drm: drm_lease.c
src/sys/external/bsd/drm2/include/drm: drm_lease.h
Log Message:
Unfinished local implementation of GPL drm_lease.c.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/drm/drm_lease.c
cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/drm2/drm/files.drmkms
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/drm/drm_lease.h
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/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.37 src/sys/external/bsd/drm2/drm/files.drmkms:1.38
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.37 Sun Dec 19 00:25:53 2021
+++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 00:26:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.37 2021/12/19 00:25:53 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.38 2021/12/19 00:26:09 riastradh Exp $
include "external/bsd/drm2/linux/files.drmkms_linux"
@@ -101,8 +101,9 @@ file external/bsd/drm2/dist/drm/drm_hdcp
file external/bsd/drm2/dist/drm/drm_ioctl.c drmkms
file external/bsd/drm2/dist/drm/drm_irq.c drmkms
file external/bsd/drm2/dist/drm/drm_kms_helper_common.c drmkms
-file external/bsd/drm2/dist/drm/drm_lease.c drmkms
-file external/bsd/drm2/dist/drm/drm_memory.c drmkms
+file external/bsd/drm2/drm/drm_lease.c drmkms
+file external/bsd/drm2/drm/drm_lock.c drmkms
+file external/bsd/drm2/drm/drm_memory.c drmkms
file external/bsd/drm2/dist/drm/drm_mm.c drmkms
file external/bsd/drm2/dist/drm/drm_mode_config.c drmkms
file external/bsd/drm2/dist/drm/drm_mode_object.c drmkms
@@ -129,6 +130,7 @@ file external/bsd/drm2/dist/drm/drm_writ
file external/bsd/drm2/drm/drm_cache.c drmkms
file external/bsd/drm2/drm/drm_fops.c drmkms
file external/bsd/drm2/drm/drm_gem_framebuffer_helper.c drmkms
+file external/bsd/drm2/drm/drm_lease.c drmkms
file external/bsd/drm2/drm/drm_lock.c drmkms
file external/bsd/drm2/drm/drm_memory.c drmkms
file external/bsd/drm2/drm/drm_scatter.c drmkms
Added files:
Index: src/sys/external/bsd/drm2/drm/drm_lease.c
diff -u /dev/null src/sys/external/bsd/drm2/drm/drm_lease.c:1.1
--- /dev/null Sun Dec 19 00:26:09 2021
+++ src/sys/external/bsd/drm2/drm/drm_lease.c Sun Dec 19 00:26:09 2021
@@ -0,0 +1,171 @@
+/* $NetBSD: drm_lease.c,v 1.1 2021/12/19 00:26:09 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: drm_lease.c,v 1.1 2021/12/19 00:26:09 riastradh Exp $");
+
+#include
+
+/*
+ * drm_lease_owner(master)
+ *
+ * Return the root of the lease tree, following parent pointers up
+ * from master.
+ */
+struct drm_master *
+drm_lease_owner(struct drm_master *master)
+{
+ struct drm_master *lessor;
+
+ while ((lessor = master->lessor) != NULL)
+ master = lessor;
+
+ return master;
+}
+
+/*
+ * drm_lease_held(file, id)
+ *
+ * XXX
+ */
+bool
+drm_lease_held(struct drm_file *file, int id)
+{
+ struct drm_master *master;
+ bool held;
+
+ if (file == NULL || (master = file->master) == NULL)
+ return true;
+
+ mutex_lock(&master->dev->mode_config.idr_mutex);
+ held = _drm_lease_held(file, id);
+ mutex_unlock(&master->dev->mode_config.idr_mutex);
+
+ return held;
+}
+
+/*
+ * _drm_lease_held(file, id)
+ *
+ * Same as drm_
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:26:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/amdgpu: files.amdgpu src/sys/external/bsd/drm2/drm: files.drmkms src/sys/external/bsd/drm2/i915drm: files.i915drmkms src/sys/external/bsd/drm2/radeon: files.radeon Log Message: Disable *_trace_points.c. I accidentally deleted these in the import, because the *_trace.h files got in the way and I forgot the *_trace_points.c files were fine. There's nothing important in them anyway, so nothing of value is lost. Maybe next time I will remember to delete the *_trace.h files on import but not the *_trace_points.c to reduce diffs, but that's too much trouble at this point. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/amdgpu/files.amdgpu cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/drm/files.drmkms cvs rdiff -u -r1.42 -r1.43 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/radeon/files.radeon Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:26:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/amdgpu: files.amdgpu src/sys/external/bsd/drm2/drm: files.drmkms src/sys/external/bsd/drm2/i915drm: files.i915drmkms src/sys/external/bsd/drm2/radeon: files.radeon Log Message: Disable *_trace_points.c. I accidentally deleted these in the import, because the *_trace.h files got in the way and I forgot the *_trace_points.c files were fine. There's nothing important in them anyway, so nothing of value is lost. Maybe next time I will remember to delete the *_trace.h files on import but not the *_trace_points.c to reduce diffs, but that's too much trouble at this point. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/amdgpu/files.amdgpu cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/drm/files.drmkms cvs rdiff -u -r1.42 -r1.43 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/radeon/files.radeon 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/amdgpu/files.amdgpu diff -u src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.9 src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.10 --- src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.9 Sun Dec 19 00:25:34 2021 +++ src/sys/external/bsd/drm2/amdgpu/files.amdgpu Sun Dec 19 00:26:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.amdgpu,v 1.9 2021/12/19 00:25:34 riastradh Exp $ +# $NetBSD: files.amdgpu,v 1.10 2021/12/19 00:26:16 riastradh Exp $ version 20180827 @@ -324,7 +324,7 @@ file external/bsd/drm2/dist/drm/amd/amdg file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_sync.c amdgpu file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_test.c amdgpu file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_tonga_ih.c amdgpu -file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_trace_points.c amdgpu +#file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_trace_points.c amdgpu file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c amdgpu file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ucode.c amdgpu file external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_umc.c amdgpu Index: src/sys/external/bsd/drm2/drm/files.drmkms diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.38 src/sys/external/bsd/drm2/drm/files.drmkms:1.39 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.38 Sun Dec 19 00:26:09 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 00:26:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.38 2021/12/19 00:26:09 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.39 2021/12/19 00:26:16 riastradh Exp $ include "external/bsd/drm2/linux/files.drmkms_linux" @@ -122,7 +122,7 @@ file external/bsd/drm2/dist/drm/drm_scdc file external/bsd/drm2/dist/drm/drm_self_refresh_helper.c drmkms file external/bsd/drm2/dist/drm/drm_syncobj.c drmkms file external/bsd/drm2/dist/drm/drm_sysfs.c drmkms -file external/bsd/drm2/dist/drm/drm_trace_points.c drmkms +#file external/bsd/drm2/dist/drm/drm_trace_points.c drmkms file external/bsd/drm2/dist/drm/drm_vblank.c drmkms file external/bsd/drm2/dist/drm/drm_vma_manager.c drmkms file external/bsd/drm2/dist/drm/drm_vm.c drmkms Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.42 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.43 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.42 Sun Dec 19 00:25:34 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 00:26:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.42 2021/12/19 00:25:34 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.43 2021/12/19 00:26:16 riastradh Exp $ version 20180827 @@ -194,7 +194,7 @@ file external/bsd/drm2/dist/drm/i915/i91 file external/bsd/drm2/dist/drm/i915/i915_switcheroo.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_syncmap.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_sysfs.c i915drmkms -file external/bsd/drm2/dist/drm/i915/i915_trace_points.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/i915_trace_points.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_user_extensions.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_utils.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_vgpu.c i915drmkms Index: src/sys/external/bsd/drm2/radeon/files.radeon diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.30 src/sys/external/bsd/drm2/radeon/files.radeon:1.31 --- src/sys/external/bsd/drm2/radeon/files.radeon:1.30 Sun Dec 19 00:25:34 2021 +++ src/sys/external/bsd/drm2/radeon/files.radeon Sun Dec 19 00:26:17 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.radeon,v 1.30 2021/12/19 00:25:34 riastradh Exp $ +# $NetBSD: files.radeon,v 1.31 2021/12/19 00:26:17 riastradh Exp $ version 20180827 @@ -133,7 +133,7 @@ file external/bsd/drm2/dist/drm/radeon/r file extern
CVS commit: src/sys/external/bsd/drm2/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:26:27 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/drm: drm_writeback.h Log Message: Disable GPL drm_writeback.c, minimal stub for drm_writeback.h. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/drm/drm_writeback.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:26:27 UTC 2021
Added Files:
src/sys/external/bsd/drm2/include/drm: drm_writeback.h
Log Message:
Disable GPL drm_writeback.c, minimal stub for drm_writeback.h.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/drm/drm_writeback.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/external/bsd/drm2/include/drm/drm_writeback.h
diff -u /dev/null src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.1
--- /dev/null Sun Dec 19 00:26:27 2021
+++ src/sys/external/bsd/drm2/include/drm/drm_writeback.h Sun Dec 19 00:26:27 2021
@@ -0,0 +1,43 @@
+/* $NetBSD: drm_writeback.h,v 1.1 2021/12/19 00:26:27 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DRM_DRM_WRITEBACK_H_
+#define _DRM_DRM_WRITEBACK_H_
+
+struct dma_fence;
+struct drm_framebuffer;
+
+struct drm_writeback_job {
+ struct drm_framebuffer *fb;
+ struct dma_fence *out_fence;
+};
+
+#endif /* _DRM_DRM_WRITEBACK_H_ */
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:26:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Added Files: src/sys/external/bsd/drm2/i915drm: i915_sw_fence.c i915_sw_fence.h Log Message: Stub i915_sw_fence.c. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c \ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:26:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Added Files: src/sys/external/bsd/drm2/i915drm: i915_sw_fence.c i915_sw_fence.h Log Message: Stub i915_sw_fence.c. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c \ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.43 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.44 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.43 Sun Dec 19 00:26:16 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 00:26:41 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.43 2021/12/19 00:26:16 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.44 2021/12/19 00:26:41 riastradh Exp $ version 20180827 @@ -36,6 +36,7 @@ makeoptions i915drmkms "CWARNFLAGS.int file external/bsd/drm2/i915drm/i915_gem_userptr.c i915drmkms file external/bsd/drm2/i915drm/i915_module.c i915drmkms file external/bsd/drm2/i915drm/i915_pci.c i915drmkms +file external/bsd/drm2/i915drm/i915_sw_fence.c i915drmkms file external/bsd/drm2/i915drm/i915_sysfs.c i915drmkms file external/bsd/drm2/i915drm/intel_dsi.c i915drmkms file external/bsd/drm2/i915drm/intel_gtt.c i915drmkms @@ -189,7 +190,7 @@ file external/bsd/drm2/dist/drm/i915/i91 file external/bsd/drm2/dist/drm/i915/i915_scatterlist.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_scheduler.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_suspend.c i915drmkms -file external/bsd/drm2/dist/drm/i915/i915_sw_fence.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/i915_sw_fence.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_sw_fence_work.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_switcheroo.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_syncmap.c i915drmkms Added files: Index: src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c:1.1 --- /dev/null Sun Dec 19 00:26:41 2021 +++ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c Sun Dec 19 00:26:41 2021 @@ -0,0 +1,35 @@ +/* $NetBSD: i915_sw_fence.c,v 1.1 2021/12/19 00:26:41 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__KERNEL_RCSID(0, "$NetBSD: i915_sw_fence.c,v 1.1 2021/12/19 00:26:41 riastradh Exp $"); + +#include "i915_sw_fence.h" Index: src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.1 --- /dev/null Sun Dec 19 00:26:41 2021 +++ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Sun Dec 19 00:26:41 2021 @@ -0,0 +1,61 @@ +/* $NetBSD: i915_sw_fence.h,v 1.1 2021/12/19 00:26:41 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:01 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: dma-fence.h src/sys/external/bsd/drm2/linux: linux_dma_fence.c Removed Files: src/sys/external/bsd/drm2/include/linux: fence.h src/sys/external/bsd/drm2/linux: linux_fence.c Log Message: Rename fence -> dma_fence, step 1: files. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/dma-fence.h cvs rdiff -u -r1.16 -r0 src/sys/external/bsd/drm2/include/linux/fence.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/linux/linux_dma_fence.c cvs rdiff -u -r1.16 -r0 src/sys/external/bsd/drm2/linux/linux_fence.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:27:01 UTC 2021
Added Files:
src/sys/external/bsd/drm2/include/linux: dma-fence.h
src/sys/external/bsd/drm2/linux: linux_dma_fence.c
Removed Files:
src/sys/external/bsd/drm2/include/linux: fence.h
src/sys/external/bsd/drm2/linux: linux_fence.c
Log Message:
Rename fence -> dma_fence, step 1: files.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/dma-fence.h
cvs rdiff -u -r1.16 -r0 src/sys/external/bsd/drm2/include/linux/fence.h
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/linux/linux_dma_fence.c
cvs rdiff -u -r1.16 -r0 src/sys/external/bsd/drm2/linux/linux_fence.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/external/bsd/drm2/include/linux/dma-fence.h
diff -u /dev/null src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.1
--- /dev/null Sun Dec 19 00:27:01 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-fence.h Sun Dec 19 00:27:01 2021
@@ -0,0 +1,143 @@
+/* $NetBSD: dma-fence.h,v 1.1 2021/12/19 00:27:01 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LINUX_FENCE_H_
+#define _LINUX_FENCE_H_
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+struct fence_cb;
+
+struct fence {
+ struct kref refcount;
+ spinlock_t *lock;
+ volatile unsigned long flags;
+ unsigned context;
+ unsigned seqno;
+ const struct fence_ops *ops;
+
+ TAILQ_HEAD(, fence_cb) f_callbacks;
+ kcondvar_t f_cv;
+ struct rcu_head f_rcu;
+};
+
+#define FENCE_FLAG_ENABLE_SIGNAL_BIT 0
+#define FENCE_FLAG_SIGNALED_BIT 1
+#define FENCE_FLAG_USER_BITS 2
+
+struct fence_ops {
+ const char *(*get_driver_name)(struct fence *);
+ const char *(*get_timeline_name)(struct fence *);
+ bool (*enable_signaling)(struct fence *);
+ bool (*signaled)(struct fence *);
+ long (*wait)(struct fence *, bool, long);
+ void (*release)(struct fence *);
+};
+
+typedef void (*fence_func_t)(struct fence *, struct fence_cb *);
+
+struct fence_cb {
+ fence_func_t fcb_func;
+ TAILQ_ENTRY(fence_cb) fcb_entry;
+ bool fcb_onqueue;
+};
+
+#define fence_add_callback linux_fence_add_callback
+#define fence_context_alloc linux_fence_context_alloc
+#define fence_default_wait linux_fence_default_wait
+#define fence_destroy linux_fence_destroy
+#define fence_enable_sw_signaling linux_fence_enable_sw_signaling
+#define fence_free linux_fence_free
+#define fence_get linux_fence_get
+#define fence_get_rcu linux_fence_get_rcu
+#define fence_init linux_fence_init
+#define fence_is_later linux_fence_is_later
+#define fence_is_signaled linux_fence_is_signaled
+#define fence_is_signaled_locked linux_fence_is_signaled_locked
+#define fence_put linux_fence_put
+#define fence_remove_callback linux_fence_remove_callback
+#define fence_signal linux_fence_signal
+#define fence_signal_locked linux_fence_signal_locked
+#define fence_wait linux_fence_wait
+#define fence_wait_any_timeout linux_fence_wait_any_timeout
+#define fence_wait_timeout linux_fence_wait_timeout
+
+extern int linux_fence_trace;
+
+void fence_init(struct fence *, const struct fence_ops *, spinlock_t *,
+ unsigned, unsigned);
+void fence_destroy(struct fence *);
+void fence_free(struct fence *);
+
+unsigned
+ fence_context_alloc(unsigned);
+bool fence_is_later(struct fence *, struct fence *);
+
+struct fence *
+ fence_get(struct fence
CVS commit: src/sys
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:09 UTC 2021 Modified Files: src/sys/external/bsd/drm2/linux: files.drmkms_linux src/sys/modules/drmkms_linux: Makefile Log Message: Rename fence -> dma_fence, step 2: files files. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/linux/files.drmkms_linux cvs rdiff -u -r1.12 -r1.13 src/sys/modules/drmkms_linux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:09 UTC 2021 Modified Files: src/sys/external/bsd/drm2/linux: files.drmkms_linux src/sys/modules/drmkms_linux: Makefile Log Message: Rename fence -> dma_fence, step 2: files files. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/linux/files.drmkms_linux cvs rdiff -u -r1.12 -r1.13 src/sys/modules/drmkms_linux/Makefile 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/linux/files.drmkms_linux diff -u src/sys/external/bsd/drm2/linux/files.drmkms_linux:1.17 src/sys/external/bsd/drm2/linux/files.drmkms_linux:1.18 --- src/sys/external/bsd/drm2/linux/files.drmkms_linux:1.17 Mon Aug 27 15:22:54 2018 +++ src/sys/external/bsd/drm2/linux/files.drmkms_linux Sun Dec 19 00:27:09 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms_linux,v 1.17 2018/08/27 15:22:54 riastradh Exp $ +# $NetBSD: files.drmkms_linux,v 1.18 2021/12/19 00:27:09 riastradh Exp $ define drmkms_linux: i2cexec, i2c_bitbang @@ -7,8 +7,8 @@ makeoptions drmkms_linux CPPFLAGS+="-I$ file external/bsd/drm2/linux/linux_atomic64.c drmkms_linux file external/bsd/drm2/linux/linux_dma_buf.c drmkms_linux +file external/bsd/drm2/linux/linux_dma_fence.c drmkms_linux file external/bsd/drm2/linux/linux_dmi.c drmkms_linux -file external/bsd/drm2/linux/linux_fence.c drmkms_linux file external/bsd/drm2/linux/linux_i2c.c drmkms_linux file external/bsd/drm2/linux/linux_idr.c drmkms_linux file external/bsd/drm2/linux/linux_kmap.c drmkms_linux Index: src/sys/modules/drmkms_linux/Makefile diff -u src/sys/modules/drmkms_linux/Makefile:1.12 src/sys/modules/drmkms_linux/Makefile:1.13 --- src/sys/modules/drmkms_linux/Makefile:1.12 Sun Feb 17 04:05:47 2019 +++ src/sys/modules/drmkms_linux/Makefile Sun Dec 19 00:27:09 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/02/17 04:05:47 rin Exp $ +# $NetBSD: Makefile,v 1.13 2021/12/19 00:27:09 riastradh Exp $ # # At some point this needs to turn into linux.kmod and a proper home for it @@ -21,8 +21,8 @@ KMOD= drmkms_linux SRCS+= linux_atomic64.c SRCS+= linux_dma_buf.c +SRCS+= linux_dma_fence.c SRCS+= linux_dmi.c -SRCS+= linux_fence.c SRCS+= linux_i2c.c SRCS+= linux_idr.c SRCS+= linux_kmap.c
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: dma-fence.h src/sys/external/bsd/drm2/linux: linux_dma_fence.c Log Message: Rename fence -> dma_fence, step 3 of 3: code. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/include/linux/dma-fence.h cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/linux/linux_dma_fence.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:27:17 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: dma-fence.h
src/sys/external/bsd/drm2/linux: linux_dma_fence.c
Log Message:
Rename fence -> dma_fence, step 3 of 3: code.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/include/linux/dma-fence.h
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/linux/linux_dma_fence.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/include/linux/dma-fence.h
diff -u src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.1 src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.2
--- src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.1 Sun Dec 19 00:27:01 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-fence.h Sun Dec 19 00:27:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dma-fence.h,v 1.1 2021/12/19 00:27:01 riastradh Exp $ */
+/* $NetBSD: dma-fence.h,v 1.2 2021/12/19 00:27:17 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -29,8 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _LINUX_FENCE_H_
-#define _LINUX_FENCE_H_
+#ifndef _LINUX_DMA_FENCE_H_
+#define _LINUX_DMA_FENCE_H_
#include
#include
@@ -41,98 +41,99 @@
#include
#include
-struct fence_cb;
+struct dma_fence_cb;
-struct fence {
- struct kref refcount;
- spinlock_t *lock;
- volatile unsigned long flags;
- unsigned context;
- unsigned seqno;
- const struct fence_ops *ops;
-
- TAILQ_HEAD(, fence_cb) f_callbacks;
- kcondvar_t f_cv;
- struct rcu_head f_rcu;
+struct dma_fence {
+ struct kref refcount;
+ spinlock_t *lock;
+ volatile unsigned long flags;
+ unsigned context;
+ unsigned seqno;
+ const struct dma_fence_ops *ops;
+
+ TAILQ_HEAD(, dma_fence_cb) f_callbacks;
+ kcondvar_t f_cv;
+ struct rcu_head f_rcu;
};
-#define FENCE_FLAG_ENABLE_SIGNAL_BIT 0
-#define FENCE_FLAG_SIGNALED_BIT 1
-#define FENCE_FLAG_USER_BITS 2
-
-struct fence_ops {
- const char *(*get_driver_name)(struct fence *);
- const char *(*get_timeline_name)(struct fence *);
- bool (*enable_signaling)(struct fence *);
- bool (*signaled)(struct fence *);
- long (*wait)(struct fence *, bool, long);
- void (*release)(struct fence *);
+#define DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT 0
+#define DMA_FENCE_FLAG_SIGNALED_BIT 1
+#define DMA_FENCE_FLAG_USER_BITS 2
+
+struct dma_fence_ops {
+ const char *(*get_driver_name)(struct dma_fence *);
+ const char *(*get_timeline_name)(struct dma_fence *);
+ bool (*enable_signaling)(struct dma_fence *);
+ bool (*signaled)(struct dma_fence *);
+ long (*wait)(struct dma_fence *, bool, long);
+ void (*release)(struct dma_fence *);
};
-typedef void (*fence_func_t)(struct fence *, struct fence_cb *);
+typedef void (*dma_fence_func_t)(struct dma_fence *, struct dma_fence_cb *);
-struct fence_cb {
- fence_func_t fcb_func;
- TAILQ_ENTRY(fence_cb) fcb_entry;
- bool fcb_onqueue;
+struct dma_fence_cb {
+ dma_fence_func_t fcb_func;
+ TAILQ_ENTRY(dma_fence_cb) fcb_entry;
+ boolfcb_onqueue;
};
-#define fence_add_callback linux_fence_add_callback
-#define fence_context_alloc linux_fence_context_alloc
-#define fence_default_wait linux_fence_default_wait
-#define fence_destroy linux_fence_destroy
-#define fence_enable_sw_signaling linux_fence_enable_sw_signaling
-#define fence_free linux_fence_free
-#define fence_get linux_fence_get
-#define fence_get_rcu linux_fence_get_rcu
-#define fence_init linux_fence_init
-#define fence_is_later linux_fence_is_later
-#define fence_is_signaled linux_fence_is_signaled
-#define fence_is_signaled_locked linux_fence_is_signaled_locked
-#define fence_put linux_fence_put
-#define fence_remove_callback linux_fence_remove_callback
-#define fence_signal linux_fence_signal
-#define fence_signal_locked linux_fence_signal_locked
-#define fence_wait linux_fence_wait
-#define fence_wait_any_timeout linux_fence_wait_any_timeout
-#define fence_wait_timeout linux_fence_wait_timeout
-
-extern int linux_fence_trace;
-
-void fence_init(struct fence *, const struct fence_ops *, spinlock_t *,
- unsigned, unsigned);
-void fence_destroy(struct fence *);
-void fence_free(struct fence *);
+#define dma_fence_add_callback linux_dma_fence_add_callback
+#define dma_fence_context_alloc linux_dma_fence_context_alloc
+#define dma_fence_default_wait linux_dma_fence_default_wait
+#define dma_fence_destroy linux_dma_fence_destroy
+#define dma_fence_enable_sw_signaling linux_dma_fence_enable_sw_signaling
+#define dma_fence_free linux_dma_fence_free
+#define dma_fence_get linux_dma_fence_get
+#define dma_fence_get_rcu linux_dma_fence_get_rcu
+#define dma_fence_init linux_dma_fence_init
+#define dma_fence_is_later linux_dma_fence_is_later
+#define dma_fence_is_signaled linux_dma_fence_is_signaled
+#define dma_fence_is_signaled_locked linux_dma_fence_is_signale
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:25 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: No more . To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/external/bsd/drm2/dist/include/drm/drmP.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:25 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: No more . To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/external/bsd/drm2/dist/include/drm/drmP.h 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/include/drm/drmP.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.43 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.44 --- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.43 Sat Dec 18 23:54:51 2021 +++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 00:27:25 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drmP.h,v 1.43 2021/12/18 23:54:51 riastradh Exp $ */ +/* $NetBSD: drmP.h,v 1.44 2021/12/19 00:27:25 riastradh Exp $ */ /* * Internal Header for the Direct Rendering Manager @@ -85,7 +85,6 @@ #include #endif -#include #include #include #include
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:36 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: llist.h Log Message: Reimplement GPL using only the upstream comments. Hope I gathered what this is trying to do...! To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/llist.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:27:36 UTC 2021
Added Files:
src/sys/external/bsd/drm2/include/linux: llist.h
Log Message:
Reimplement GPL using only the upstream comments.
Hope I gathered what this is trying to do...!
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/llist.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/external/bsd/drm2/include/linux/llist.h
diff -u /dev/null src/sys/external/bsd/drm2/include/linux/llist.h:1.1
--- /dev/null Sun Dec 19 00:27:36 2021
+++ src/sys/external/bsd/drm2/include/linux/llist.h Sun Dec 19 00:27:36 2021
@@ -0,0 +1,116 @@
+/* $NetBSD: llist.h,v 1.1 2021/12/19 00:27:36 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LINUX_LLIST_H_
+#define _LINUX_LLIST_H_
+
+#include
+#include
+
+struct llist_head {
+ struct llist_node *llh_first;
+};
+
+struct llist_node {
+ struct llist_node *llh_next;
+};
+
+static inline void
+init_llist_head(struct llist_head *head)
+{
+
+ head->llh_first = NULL;
+}
+
+#define llist_entry(NODE, TYPE, FIELD) container_of(NODE, TYPE, FIELD)
+
+static inline bool
+llist_empty(struct llist_head *head)
+{
+ bool empty;
+
+ empty = (head->llh_first == NULL);
+ membar_enter();
+
+ return empty;
+}
+
+static inline bool
+llist_add(struct llist_node *node, struct llist_head *head)
+{
+ struct llist_node *first;
+
+ do {
+ first = head->llh_first;
+ node->llh_next = first;
+ membar_exit();
+ } while (atomic_cas_ptr(&head->llh_first, first, node) != first);
+
+ return first == NULL;
+}
+
+static inline struct llist_node *
+llist_del_all(struct llist_head *head)
+{
+ struct llist_node *first;
+
+ first = atomic_swap_ptr(&head->llh_first, NULL);
+ membar_enter();
+
+ return first;
+}
+
+static inline struct llist_node *
+llist_del_first(struct llist_head *head)
+{
+ struct llist_node *first;
+
+ do {
+ first = head->llh_first;
+ membar_datadep_consumer();
+ } while (atomic_cas_ptr(&head->llh_first, first, first->llh_next)
+ != first);
+ membar_enter();
+
+ return first;
+}
+
+#define llist_for_each_entry_safe(ENTRY, TMP, NODE, FIELD) \
+ for ((ENTRY) = ((NODE) == NULL ? NULL : \
+ llist_entry(NODE, typeof(*(ENTRY)), FIELD)); \
+ (ENTRY) == NULL ? 0 : \
+ (membar_datadep_consumer(), \
+ (TMP) = list_entry((ENTRY)->FIELD.llh_next, \
+ typeof(*(ENTRY)), FIELD), \
+ 1), \
+ (ENTRY) = (TMP))
+
+#endif /* _LINUX_LLIST_H_ */
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:46 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: irqreturn.h Log Message: Stub to just include drm_irq_netbsd.h. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/irqreturn.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:46 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: irqreturn.h Log Message: Stub to just include drm_irq_netbsd.h. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/irqreturn.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/external/bsd/drm2/include/linux/irqreturn.h diff -u /dev/null src/sys/external/bsd/drm2/include/linux/irqreturn.h:1.1 --- /dev/null Sun Dec 19 00:27:46 2021 +++ src/sys/external/bsd/drm2/include/linux/irqreturn.h Sun Dec 19 00:27:46 2021 @@ -0,0 +1,37 @@ +/* $NetBSD: irqreturn.h,v 1.1 2021/12/19 00:27:46 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUX_IRQRETURN_H_ +#define _LINUX_IRQRETURN_H_ + +#include + +#endif /* _LINUX_IRQRETURN_H_ */
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:52 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: No more hacks for dist/uapi -- got moved to dist/include/uapi. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/drm/files.drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:27:52 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: No more hacks for dist/uapi -- got moved to dist/include/uapi. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/drm/files.drmkms 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/drm/files.drmkms diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.39 src/sys/external/bsd/drm2/drm/files.drmkms:1.40 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.39 Sun Dec 19 00:26:16 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 00:27:52 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.39 2021/12/19 00:26:16 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.40 2021/12/19 00:27:52 riastradh Exp $ include "external/bsd/drm2/linux/files.drmkms_linux" @@ -25,13 +25,7 @@ makeoptions drmkms CPPFLAGS+="-I$S/exte # Then upstream. makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include" makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm" -makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi" - -# Must come last because some header file names are repeated in -# dist/drm (I'm looking ta you, drm_legacy.h), while others sometimes -# explicitly write . (Maybe that should have been imported -# under dist/include/uapi rather than dist/uapi.) -makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist" +makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/uapi" # XXX Should probably be in a header file. opt_drmkms.h? makeoptions drmkms CPPFLAGS+="-D__KERNEL__"
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:28:12 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: compiler.h scatterlist.h seqlock.h sort.h Log Message: Stub linux compiler.h, scatterlist.h, seqlock.h, sort.h. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/compiler.h \ src/sys/external/bsd/drm2/include/linux/scatterlist.h \ src/sys/external/bsd/drm2/include/linux/seqlock.h \ src/sys/external/bsd/drm2/include/linux/sort.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:28:12 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: compiler.h scatterlist.h seqlock.h sort.h Log Message: Stub linux compiler.h, scatterlist.h, seqlock.h, sort.h. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/compiler.h \ src/sys/external/bsd/drm2/include/linux/scatterlist.h \ src/sys/external/bsd/drm2/include/linux/seqlock.h \ src/sys/external/bsd/drm2/include/linux/sort.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/external/bsd/drm2/include/linux/compiler.h diff -u /dev/null src/sys/external/bsd/drm2/include/linux/compiler.h:1.1 --- /dev/null Sun Dec 19 00:28:12 2021 +++ src/sys/external/bsd/drm2/include/linux/compiler.h Sun Dec 19 00:28:12 2021 @@ -0,0 +1,35 @@ +/* $NetBSD: compiler.h,v 1.1 2021/12/19 00:28:12 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUX_COMPILER_H_ +#define _LINUX_COMPILER_H_ + +#endif /* _LINUX_COMPILER_H_ */ Index: src/sys/external/bsd/drm2/include/linux/scatterlist.h diff -u /dev/null src/sys/external/bsd/drm2/include/linux/scatterlist.h:1.1 --- /dev/null Sun Dec 19 00:28:12 2021 +++ src/sys/external/bsd/drm2/include/linux/scatterlist.h Sun Dec 19 00:28:12 2021 @@ -0,0 +1,35 @@ +/* $NetBSD: scatterlist.h,v 1.1 2021/12/19 00:28:12 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUX_SCATTERLIST_H_ +#define _LINUX_SCATTERLIST_H_ + +#endif /* _LINUX_SCATTERLIST_H_ */ Index: src/sys/external/bsd/drm2/include/linux/seqlock.h diff -u /dev/null src/sys/external/bsd/drm2/include/linux/seqlock.h:1.1 --- /dev/null Sun Dec 19 00:28:12 2021 +++ src/sys/external/bsd/drm2/include/linux/seqlock.h Sun Dec 19 00:28:12 2021 @@ -0,0 +1,35 @@ +/* $NetBSD: seqlock.h,v 1.1 2021/12/19 00:28:12 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, I
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:28:20 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_agp_hook.c drm_cdevsw.c drm_lock.c drm_module.c drm_scatter.c drm_sysfs.c Log Message: Include drm_internal.h by "../dist/drm/drm_internal.h". To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_agp_hook.c cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/drm/drm_cdevsw.c cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/drm/drm_lock.c cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/drm/drm_module.c cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/drm/drm_scatter.c cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drm_sysfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:28:20 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_agp_hook.c drm_cdevsw.c drm_lock.c
drm_module.c drm_scatter.c drm_sysfs.c
Log Message:
Include drm_internal.h by "../dist/drm/drm_internal.h".
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_agp_hook.c
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/drm/drm_cdevsw.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/drm/drm_lock.c
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/drm/drm_module.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/drm/drm_scatter.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drm_sysfs.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/drm/drm_agp_hook.c
diff -u src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.3 src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.4
--- src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.3 Thu Aug 30 22:39:54 2018
+++ src/sys/external/bsd/drm2/drm/drm_agp_hook.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_agp_hook.c,v 1.3 2018/08/30 22:39:54 mrg Exp $ */
+/* $NetBSD: drm_agp_hook.c,v 1.4 2021/12/19 00:28:20 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.3 2018/08/30 22:39:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.4 2021/12/19 00:28:20 riastradh Exp $");
#include
#include
@@ -39,7 +39,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_agp_hook
#include
#include
-#include
+
+#include "../dist/drm/drm_internal.h"
static struct {
kmutex_t lock;
Index: src/sys/external/bsd/drm2/drm/drm_cdevsw.c
diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.16 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.17
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.16 Sun Sep 26 01:16:10 2021
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cdevsw.c,v 1.16 2021/09/26 01:16:10 thorpej Exp $ */
+/* $NetBSD: drm_cdevsw.c,v 1.17 2021/12/19 00:28:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.16 2021/09/26 01:16:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.17 2021/12/19 00:28:20 riastradh Exp $");
#include
#include
@@ -58,7 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c
#include
#include
-#include
+
+#include "../dist/drm/drm_internal.h"
#include "../dist/drm/drm_legacy.h"
static dev_type_open(drm_open);
Index: src/sys/external/bsd/drm2/drm/drm_lock.c
diff -u src/sys/external/bsd/drm2/drm/drm_lock.c:1.8 src/sys/external/bsd/drm2/drm/drm_lock.c:1.9
--- src/sys/external/bsd/drm2/drm/drm_lock.c:1.8 Sat May 23 23:42:43 2020
+++ src/sys/external/bsd/drm2/drm/drm_lock.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_lock.c,v 1.8 2020/05/23 23:42:43 ad Exp $ */
+/* $NetBSD: drm_lock.c,v 1.9 2021/12/19 00:28:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -46,14 +46,15 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.8 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.9 2021/12/19 00:28:20 riastradh Exp $");
#include
#include
#include
#include
-#include
+
+#include "../dist/drm/drm_internal.h"
#include "../dist/drm/drm_legacy.h"
static bool drm_lock_acquire(struct drm_lock_data *, int);
Index: src/sys/external/bsd/drm2/drm/drm_module.c
diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.17 src/sys/external/bsd/drm2/drm/drm_module.c:1.18
--- src/sys/external/bsd/drm2/drm/drm_module.c:1.17 Fri Jan 3 21:01:16 2020
+++ src/sys/external/bsd/drm2/drm/drm_module.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_module.c,v 1.17 2020/01/03 21:01:16 jmcneill Exp $ */
+/* $NetBSD: drm_module.c,v 1.18 2021/12/19 00:28:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.17 2020/01/03 21:01:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.18 2021/12/19 00:28:20 riastradh Exp $");
#include
#include
@@ -46,10 +46,11 @@ __KERNEL_RCSID(0, "$NetBSD: drm_module.c
#include
#include
-#include
#include
#include
+#include "../dist/drm/drm_internal.h"
+
/*
* XXX This is stupid.
*
Index: src/sys/external/bsd/drm2/drm/drm_scatter.c
diff -u src/sys/external/bsd/drm2/drm/drm_scatter.c:1.5 src/sys/external/bsd/drm2/drm/drm_scatter.c:1.6
--- src/sys/external/bsd/drm2/drm/drm_scatter.c:1.5 Mon Aug 27 07:02:06 2018
+++ src/sys/external/bsd/drm2/drm/drm_scatter.c Sun Dec 19 00:28:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_scatter.c,v 1.5 2018/08/27 07:02:06 ria
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:28:31 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: srcu.h Log Message: Stub . To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/srcu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:28:31 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: srcu.h Log Message: Stub . To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/srcu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/external/bsd/drm2/include/linux/srcu.h diff -u /dev/null src/sys/external/bsd/drm2/include/linux/srcu.h:1.1 --- /dev/null Sun Dec 19 00:28:31 2021 +++ src/sys/external/bsd/drm2/include/linux/srcu.h Sun Dec 19 00:28:30 2021 @@ -0,0 +1,35 @@ +/* $NetBSD: srcu.h,v 1.1 2021/12/19 00:28:30 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUX_SRCU_H_ +#define _LINUX_SRCU_H_ + +#endif /* _LINUX_SRCU_H_ */
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:28:37 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: reservation.h
Log Message:
fence -> dma_fence in .
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/include/linux/reservation.h
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/include/linux/reservation.h
diff -u src/sys/external/bsd/drm2/include/linux/reservation.h:1.8 src/sys/external/bsd/drm2/include/linux/reservation.h:1.9
--- src/sys/external/bsd/drm2/include/linux/reservation.h:1.8 Mon Aug 27 15:25:13 2018
+++ src/sys/external/bsd/drm2/include/linux/reservation.h Sun Dec 19 00:28:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: reservation.h,v 1.8 2018/08/27 15:25:13 riastradh Exp $ */
+/* $NetBSD: reservation.h,v 1.9 2021/12/19 00:28:37 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#ifndef _LINUX_RESERVATION_H_
#define _LINUX_RESERVATION_H_
-#include
+#include
#include
#include
@@ -40,7 +40,7 @@ struct reservation_object {
struct ww_mutex lock;
unsignedrobj_version;
- struct fence __rcu *robj_fence;
+ struct dma_fence __rcu *robj_fence;
struct reservation_object_list __rcu *robj_list;
struct reservation_object_list __rcu *robj_prealloc;
};
@@ -50,14 +50,14 @@ struct reservation_object_list {
uint32_t shared_count;
uint32_t shared_max;
- struct fence __rcu *shared[];
+ struct dma_fence __rcu *shared[];
};
/* NetBSD addition */
struct reservation_poll {
kmutex_t rp_lock;
struct selinfo rp_selq;
- struct fence_cb rp_fcb;
+ struct dma_fence_cb rp_fcb;
bool rp_claimed;
};
@@ -83,18 +83,18 @@ extern struct ww_class reservation_ww_cl
void reservation_object_init(struct reservation_object *);
void reservation_object_fini(struct reservation_object *);
bool reservation_object_held(struct reservation_object *);
-struct fence *
+struct dma_fence *
reservation_object_get_excl(struct reservation_object *);
struct reservation_object_list *
reservation_object_get_list(struct reservation_object *);
int reservation_object_reserve_shared(struct reservation_object *);
void reservation_object_add_excl_fence(struct reservation_object *,
- struct fence *);
+ struct dma_fence *);
void reservation_object_add_shared_fence(struct reservation_object *,
- struct fence *);
+ struct dma_fence *);
int reservation_object_get_fences_rcu(struct reservation_object *,
- struct fence **, unsigned *, struct fence ***);
+ struct dma_fence **, unsigned *, struct dma_fence ***);
bool reservation_object_test_signaled_rcu(struct reservation_object *,
bool);
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:28:37 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: reservation.h Log Message: fence -> dma_fence in . To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/drm2/include/linux/reservation.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:28:55 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: interval_tree_generic.h mem_encrypt.h sync_file.h Log Message: Stub linux interval_tree_generic.h, mem_encrypt.h, sync_file.h. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/include/linux/interval_tree_generic.h \ src/sys/external/bsd/drm2/include/linux/mem_encrypt.h \ src/sys/external/bsd/drm2/include/linux/sync_file.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:28:55 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: interval_tree_generic.h mem_encrypt.h sync_file.h Log Message: Stub linux interval_tree_generic.h, mem_encrypt.h, sync_file.h. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/include/linux/interval_tree_generic.h \ src/sys/external/bsd/drm2/include/linux/mem_encrypt.h \ src/sys/external/bsd/drm2/include/linux/sync_file.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/external/bsd/drm2/include/linux/interval_tree_generic.h diff -u /dev/null src/sys/external/bsd/drm2/include/linux/interval_tree_generic.h:1.1 --- /dev/null Sun Dec 19 00:28:55 2021 +++ src/sys/external/bsd/drm2/include/linux/interval_tree_generic.h Sun Dec 19 00:28:55 2021 @@ -0,0 +1,35 @@ +/* $NetBSD: interval_tree_generic.h,v 1.1 2021/12/19 00:28:55 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUX_INTERVAL_TREE_GENERIC_H_ +#define _LINUX_INTERVAL_TREE_GENERIC_H_ + +#endif /* _LINUX_INTERVAL_TREE_GENERIC_H_ */ Index: src/sys/external/bsd/drm2/include/linux/mem_encrypt.h diff -u /dev/null src/sys/external/bsd/drm2/include/linux/mem_encrypt.h:1.1 --- /dev/null Sun Dec 19 00:28:55 2021 +++ src/sys/external/bsd/drm2/include/linux/mem_encrypt.h Sun Dec 19 00:28:55 2021 @@ -0,0 +1,35 @@ +/* $NetBSD: mem_encrypt.h,v 1.1 2021/12/19 00:28:55 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUX_MEM_ENCRYPT_H_ +#define _LINUX_MEM_ENCRYPT_H_ + +#endif /* _LINUX_MEM_ENCRYPT_H_ */ Index: src/sys/external/bsd/drm2/include/linux/sync_file.h diff -u /dev/null src/sys/external/bsd/drm2/include/linux/sync_file.h:1.1 --- /dev/null Sun Dec 19 00:28:55 2021 +++ src/sys/external/bsd/drm2/include/linux/sync_file.h Sun Dec 19 00:28:55 2021 @@ -0,0 +1,35 @@ +/* $NetBSD: sync_file.h,v 1.1 2021/12/19
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:29:02 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_fb_helper.c Log Message: Fix up #ifdefs. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:29:02 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_fb_helper.c
Log Message:
Fix up #ifdefs.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.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/drm_fb_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.17 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.18
--- src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.17 Sat Dec 18 23:44:57 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Sun Dec 19 00:29:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_fb_helper.c,v 1.17 2021/12/18 23:44:57 riastradh Exp $ */
+/* $NetBSD: drm_fb_helper.c,v 1.18 2021/12/19 00:29:02 riastradh Exp $ */
/*
* Copyright (c) 2006-2009 Red Hat Inc.
@@ -30,7 +30,7 @@
* Jesse Barnes
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.17 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.18 2021/12/19 00:29:02 riastradh Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -615,11 +615,8 @@ void drm_fb_helper_fini(struct drm_fb_he
mutex_lock(&kernel_fb_helper_lock);
if (!list_empty(&fb_helper->kernel_fb_list)) {
list_del(&fb_helper->kernel_fb_list);
- if (list_empty(&kernel_fb_helper_list)) {
-#ifndef __NetBSD__ /* XXX drm sysrq */
+ if (list_empty(&kernel_fb_helper_list))
unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
-#endif
- }
}
mutex_unlock(&kernel_fb_helper_lock);
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:29:10 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_print.c Log Message: in NetBSD. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/drm_print.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:29:10 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_print.c Log Message: in NetBSD. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/drm_print.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/drm_print.c diff -u src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.2 src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.3 --- src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.2 Sat Dec 18 23:44:57 2021 +++ src/sys/external/bsd/drm2/dist/drm/drm_print.c Sun Dec 19 00:29:09 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_print.c,v 1.2 2021/12/18 23:44:57 riastradh Exp $ */ +/* $NetBSD: drm_print.c,v 1.3 2021/12/19 00:29:09 riastradh Exp $ */ /* * Copyright (C) 2016 Red Hat @@ -26,14 +26,18 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.2 2021/12/18 23:44:57 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.3 2021/12/19 00:29:09 riastradh Exp $"); #define DEBUG /* for pr_debug() */ +#ifdef __NetBSD__ +#include +#else #include #include #include +#endif #include #include
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:29:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: export.h Log Message: Define IS_ENABLED and IS_REACHABLE. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/export.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:29:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: export.h Log Message: Define IS_ENABLED and IS_REACHABLE. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/export.h 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/include/linux/export.h diff -u src/sys/external/bsd/drm2/include/linux/export.h:1.2 src/sys/external/bsd/drm2/include/linux/export.h:1.3 --- src/sys/external/bsd/drm2/include/linux/export.h:1.2 Tue Mar 18 18:20:43 2014 +++ src/sys/external/bsd/drm2/include/linux/export.h Sun Dec 19 00:29:17 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: export.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $ */ +/* $NetBSD: export.h,v 1.3 2021/12/19 00:29:17 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -37,4 +37,7 @@ /* XXX Provisional -- this shouldn't happen in sources we use. */ #define EXPORT_SYMBOL_GPL(name) +#define IS_ENABLED(X) X +#define IS_REACHABLE(X) X + #endif /* _LINUX_EXPORT_H_ */
CVS commit: src/sys/external/bsd/drm2/include
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:30:01 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: anon_inodes.h cache.h pagevec.h perf_event.h radix-tree.h relay.h spinlock_types.h src/sys/external/bsd/drm2/include/linux/sched: clock.h signal.h src/sys/external/bsd/drm2/include/media: cec-notifier.h Log Message: More Linux header stubs. Let's just use empty header files until we actually populate these. Save a bit of disk space... To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/anon_inodes.h \ src/sys/external/bsd/drm2/include/linux/cache.h \ src/sys/external/bsd/drm2/include/linux/pagevec.h \ src/sys/external/bsd/drm2/include/linux/perf_event.h \ src/sys/external/bsd/drm2/include/linux/radix-tree.h \ src/sys/external/bsd/drm2/include/linux/relay.h \ src/sys/external/bsd/drm2/include/linux/spinlock_types.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/sched/clock.h \ src/sys/external/bsd/drm2/include/linux/sched/signal.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/media/cec-notifier.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:30:01 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: anon_inodes.h cache.h pagevec.h perf_event.h radix-tree.h relay.h spinlock_types.h src/sys/external/bsd/drm2/include/linux/sched: clock.h signal.h src/sys/external/bsd/drm2/include/media: cec-notifier.h Log Message: More Linux header stubs. Let's just use empty header files until we actually populate these. Save a bit of disk space... To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/anon_inodes.h \ src/sys/external/bsd/drm2/include/linux/cache.h \ src/sys/external/bsd/drm2/include/linux/pagevec.h \ src/sys/external/bsd/drm2/include/linux/perf_event.h \ src/sys/external/bsd/drm2/include/linux/radix-tree.h \ src/sys/external/bsd/drm2/include/linux/relay.h \ src/sys/external/bsd/drm2/include/linux/spinlock_types.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/sched/clock.h \ src/sys/external/bsd/drm2/include/linux/sched/signal.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/media/cec-notifier.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files:
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:30:11 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: sizes.h Log Message: linux/sizes.h To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/sizes.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:30:11 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/linux: sizes.h Log Message: linux/sizes.h To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/sizes.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/external/bsd/drm2/include/linux/sizes.h diff -u /dev/null src/sys/external/bsd/drm2/include/linux/sizes.h:1.1 --- /dev/null Sun Dec 19 00:30:11 2021 +++ src/sys/external/bsd/drm2/include/linux/sizes.h Sun Dec 19 00:30:11 2021 @@ -0,0 +1,39 @@ +/* $NetBSD: sizes.h,v 1.1 2021/12/19 00:30:11 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUX_SIZES_H_ +#define _LINUX_SIZES_H_ + +#define SZ_8K 0x8000 +#define SZ_1M 0x0010 +#define SZ_2M 0x0020 + +#endif /* _LINUX_SIZES_H_ */
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:30:18 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Define IS_ENABLED and IS_REACHABLE on the command line. Header file is too late for it, apparently. XXX Find a way to put this into a header file; command-line -D arguments are ugly. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/external/bsd/drm2/drm/files.drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:30:18 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Define IS_ENABLED and IS_REACHABLE on the command line. Header file is too late for it, apparently. XXX Find a way to put this into a header file; command-line -D arguments are ugly. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/external/bsd/drm2/drm/files.drmkms 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/drm/files.drmkms diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.40 src/sys/external/bsd/drm2/drm/files.drmkms:1.41 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.40 Sun Dec 19 00:27:52 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 00:30:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.40 2021/12/19 00:27:52 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.41 2021/12/19 00:30:18 riastradh Exp $ include "external/bsd/drm2/linux/files.drmkms_linux" @@ -35,6 +35,9 @@ makeoptions drmkms CPPFLAGS+="-DCONFIG_B makeoptions drmkms CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1" makeoptions drmkms CPPFLAGS+="-DCONFIG_FB=0" +makeoptions drmkms CPPFLAGS+="-DIS_ENABLED\(X\)=X" +makeoptions drmkms CPPFLAGS+="-DIS_REACHABLE\(X\)=X" + # NetBSD additions. file external/bsd/drm2/drm/drm_agp_hook.c drmkms file external/bsd/drm2/drm/drm_cdevsw.c drmkms
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:30:25 UTC 2021 Modified Files: src/sys/external/bsd/drm2/linux: linux_dma_buf.c Log Message: No need for in linux_dma_buf.c. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/linux/linux_dma_buf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:30:25 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/linux: linux_dma_buf.c
Log Message:
No need for in linux_dma_buf.c.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/linux/linux_dma_buf.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/linux/linux_dma_buf.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.6 src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.7
--- src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.6 Thu Oct 17 14:33:02 2019
+++ src/sys/external/bsd/drm2/linux/linux_dma_buf.c Sun Dec 19 00:30:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_buf.c,v 1.6 2019/10/17 14:33:02 maya Exp $ */
+/* $NetBSD: linux_dma_buf.c,v 1.7 2021/12/19 00:30:25 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_buf.c,v 1.6 2019/10/17 14:33:02 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_buf.c,v 1.7 2021/12/19 00:30:25 riastradh Exp $");
#include
#include
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_dma_bu
#include
#include
-#include
#include
struct dma_buf_file {
CVS commit: src/sys/external/bsd/drm2/include
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:31:28 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/asm: iosf_mbi.h pgtable.h set_memory.h src/sys/external/bsd/drm2/include/asm/fpu: api.h src/sys/external/bsd/drm2/include/linux: dma-fence-array.h fault-inject.h nospec.h prefetch.h random.h stop_machine.h uuid.h src/sys/external/bsd/drm2/include/linux/sched: mm.h src/sys/external/bsd/drm2/include/uapi/linux/sched: types.h Log Message: Bunch more Linux header file stubs. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/asm/iosf_mbi.h \ src/sys/external/bsd/drm2/include/asm/pgtable.h \ src/sys/external/bsd/drm2/include/asm/set_memory.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/asm/fpu/api.h cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/include/linux/dma-fence-array.h \ src/sys/external/bsd/drm2/include/linux/fault-inject.h \ src/sys/external/bsd/drm2/include/linux/nospec.h \ src/sys/external/bsd/drm2/include/linux/prefetch.h \ src/sys/external/bsd/drm2/include/linux/random.h \ src/sys/external/bsd/drm2/include/linux/stop_machine.h \ src/sys/external/bsd/drm2/include/linux/uuid.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/sched/mm.h cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/include/uapi/linux/sched/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:31:28 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/asm: iosf_mbi.h pgtable.h set_memory.h src/sys/external/bsd/drm2/include/asm/fpu: api.h src/sys/external/bsd/drm2/include/linux: dma-fence-array.h fault-inject.h nospec.h prefetch.h random.h stop_machine.h uuid.h src/sys/external/bsd/drm2/include/linux/sched: mm.h src/sys/external/bsd/drm2/include/uapi/linux/sched: types.h Log Message: Bunch more Linux header file stubs. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/asm/iosf_mbi.h \ src/sys/external/bsd/drm2/include/asm/pgtable.h \ src/sys/external/bsd/drm2/include/asm/set_memory.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/asm/fpu/api.h cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/include/linux/dma-fence-array.h \ src/sys/external/bsd/drm2/include/linux/fault-inject.h \ src/sys/external/bsd/drm2/include/linux/nospec.h \ src/sys/external/bsd/drm2/include/linux/prefetch.h \ src/sys/external/bsd/drm2/include/linux/random.h \ src/sys/external/bsd/drm2/include/linux/stop_machine.h \ src/sys/external/bsd/drm2/include/linux/uuid.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/sched/mm.h cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/include/uapi/linux/sched/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files:
CVS commit: src/sys/external/bsd
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:31:35 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: kernel.h src/sys/external/bsd/drm2/drm: files.drmkms src/sys/external/bsd/drm2/include/linux: export.h Log Message: Move IS_REACHABLE to to avoid double definition. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/common/include/linux/kernel.h cvs rdiff -u -r1.41 -r1.42 src/sys/external/bsd/drm2/drm/files.drmkms cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/export.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:31:35 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: kernel.h src/sys/external/bsd/drm2/drm: files.drmkms src/sys/external/bsd/drm2/include/linux: export.h Log Message: Move IS_REACHABLE to to avoid double definition. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/common/include/linux/kernel.h cvs rdiff -u -r1.41 -r1.42 src/sys/external/bsd/drm2/drm/files.drmkms cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/export.h 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/common/include/linux/kernel.h diff -u src/sys/external/bsd/common/include/linux/kernel.h:1.26 src/sys/external/bsd/common/include/linux/kernel.h:1.27 --- src/sys/external/bsd/common/include/linux/kernel.h:1.26 Mon Oct 19 11:49:56 2020 +++ src/sys/external/bsd/common/include/linux/kernel.h Sun Dec 19 00:31:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: kernel.h,v 1.26 2020/10/19 11:49:56 jmcneill Exp $ */ +/* $NetBSD: kernel.h,v 1.27 2021/12/19 00:31:35 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -60,8 +60,9 @@ #define __LITTLE_ENDIAN _LITTLE_ENDIAN #endif -#define IS_ENABLED(option) (option) #define IS_BUILTIN(option) (1) /* Probably... */ +#define IS_ENABLED(option) (option) +#define IS_REACHABLE(option) (option) #define __printf __printflike #define __user Index: src/sys/external/bsd/drm2/drm/files.drmkms diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.41 src/sys/external/bsd/drm2/drm/files.drmkms:1.42 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.41 Sun Dec 19 00:30:18 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 00:31:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.41 2021/12/19 00:30:18 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.42 2021/12/19 00:31:35 riastradh Exp $ include "external/bsd/drm2/linux/files.drmkms_linux" @@ -35,9 +35,6 @@ makeoptions drmkms CPPFLAGS+="-DCONFIG_B makeoptions drmkms CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1" makeoptions drmkms CPPFLAGS+="-DCONFIG_FB=0" -makeoptions drmkms CPPFLAGS+="-DIS_ENABLED\(X\)=X" -makeoptions drmkms CPPFLAGS+="-DIS_REACHABLE\(X\)=X" - # NetBSD additions. file external/bsd/drm2/drm/drm_agp_hook.c drmkms file external/bsd/drm2/drm/drm_cdevsw.c drmkms Index: src/sys/external/bsd/drm2/include/linux/export.h diff -u src/sys/external/bsd/drm2/include/linux/export.h:1.3 src/sys/external/bsd/drm2/include/linux/export.h:1.4 --- src/sys/external/bsd/drm2/include/linux/export.h:1.3 Sun Dec 19 00:29:17 2021 +++ src/sys/external/bsd/drm2/include/linux/export.h Sun Dec 19 00:31:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: export.h,v 1.3 2021/12/19 00:29:17 riastradh Exp $ */ +/* $NetBSD: export.h,v 1.4 2021/12/19 00:31:35 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -37,7 +37,4 @@ /* XXX Provisional -- this shouldn't happen in sources we use. */ #define EXPORT_SYMBOL_GPL(name) -#define IS_ENABLED(X) X -#define IS_REACHABLE(X) X - #endif /* _LINUX_EXPORT_H_ */
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:31:43 UTC 2021 Modified Files: src/sys/external/bsd/drm2/linux: linux_reservation.c Log Message: fence -> dma_fence in linux_reservation.c. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/sys/external/bsd/drm2/linux/linux_reservation.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:31:43 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/linux: linux_reservation.c
Log Message:
fence -> dma_fence in linux_reservation.c.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/drm2/linux/linux_reservation.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/linux/linux_reservation.c
diff -u src/sys/external/bsd/drm2/linux/linux_reservation.c:1.14 src/sys/external/bsd/drm2/linux/linux_reservation.c:1.15
--- src/sys/external/bsd/drm2/linux/linux_reservation.c:1.14 Mon Aug 2 23:14:15 2021
+++ src/sys/external/bsd/drm2/linux/linux_reservation.c Sun Dec 19 00:31:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_reservation.c,v 1.14 2021/08/02 23:14:15 riastradh Exp $ */
+/* $NetBSD: linux_reservation.c,v 1.15 2021/12/19 00:31:43 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.14 2021/08/02 23:14:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.15 2021/12/19 00:31:43 riastradh Exp $");
#include
#include
#include
-#include
+#include
#include
#include
@@ -111,11 +111,11 @@ reservation_object_fini(struct reservati
objlist_free(robj->robj_prealloc);
if (robj->robj_list) {
for (i = 0; i < robj->robj_list->shared_count; i++)
- fence_put(robj->robj_list->shared[i]);
+ dma_fence_put(robj->robj_list->shared[i]);
objlist_free(robj->robj_list);
}
if (robj->robj_fence)
- fence_put(robj->robj_fence);
+ dma_fence_put(robj->robj_fence);
ww_mutex_destroy(&robj->lock);
}
@@ -139,7 +139,7 @@ reservation_object_held(struct reservati
*
* Caller must have robj locked.
*/
-struct fence *
+struct dma_fence *
reservation_object_get_excl(struct reservation_object *robj)
{
@@ -324,9 +324,9 @@ reservation_object_read_valid(struct res
*/
void
reservation_object_add_excl_fence(struct reservation_object *robj,
-struct fence *fence)
+struct dma_fence *fence)
{
- struct fence *old_fence = robj->robj_fence;
+ struct dma_fence *old_fence = robj->robj_fence;
struct reservation_object_list *old_list = robj->robj_list;
uint32_t old_shared_count;
struct reservation_object_write_ticket ticket;
@@ -338,7 +338,7 @@ reservation_object_add_excl_fence(struct
* a reference for ourselves.
*/
if (fence)
- (void)fence_get(fence);
+ (void)dma_fence_get(fence);
/* If there are any shared fences, remember how many. */
if (old_list)
@@ -357,12 +357,12 @@ reservation_object_add_excl_fence(struct
/* Release the old exclusive fence, if any. */
if (old_fence)
- fence_put(old_fence);
+ dma_fence_put(old_fence);
/* Release any old shared fences. */
if (old_list) {
while (old_shared_count--)
- fence_put(old_list->shared[old_shared_count]);
+ dma_fence_put(old_list->shared[old_shared_count]);
}
}
@@ -379,19 +379,19 @@ reservation_object_add_excl_fence(struct
*/
void
reservation_object_add_shared_fence(struct reservation_object *robj,
-struct fence *fence)
+struct dma_fence *fence)
{
struct reservation_object_list *list = robj->robj_list;
struct reservation_object_list *prealloc = robj->robj_prealloc;
struct reservation_object_write_ticket ticket;
- struct fence *replace = NULL;
+ struct dma_fence *replace = NULL;
uint32_t i;
KASSERT(reservation_object_held(robj));
/* Acquire a reference to the fence. */
KASSERT(fence != NULL);
- (void)fence_get(fence);
+ (void)dma_fence_get(fence);
/* Check for a preallocated replacement list. */
if (prealloc == NULL) {
@@ -471,16 +471,16 @@ reservation_object_add_shared_fence(stru
/* Release a fence if we replaced it. */
if (replace)
- fence_put(replace);
+ dma_fence_put(replace);
}
int
reservation_object_get_fences_rcu(struct reservation_object *robj,
-struct fence **fencep, unsigned *nsharedp, struct fence ***sharedp)
+struct dma_fence **fencep, unsigned *nsharedp, struct dma_fence ***sharedp)
{
struct reservation_object_list *list;
- struct fence *fence;
- struct fence **shared = NULL;
+ struct dma_fence *fence;
+ struct dma_fence **shared = NULL;
unsigned shared_alloc, shared_count, i;
struct reservation_object_read_ticket ticket;
@@ -563,7 +563,7 @@ top:
* one. If we can't, start over.
*/
if (fence) {
- if (fence_get_rcu(fence) == NULL)
+ if (dma_fence_get_rcu(fence) == NULL)
goto restart;
}
@@ -571,7 +571,7 @@ top:
* Try to get a reference to all of the shared fences.
*/
for (i = 0; i < shared_count; i++) {
- if (fence_get_rcu(shared[i]) == NULL)
+ if (dma_fence_get_rcu(shared[i]) == NULL)
goto put_restart;
}
@@ -585,11 +585,11 @@ top:
put_restart:
/* Back out. */
while (i --> 0) {
- fence_put(shared[i]);
+ dma_fence
CVS commit: src/sys/external/bsd/drm2/include/trace/events
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:31:53 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/trace/events: dma_fence.h Log Message: Stub Linux . To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/include/trace/events/dma_fence.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/trace/events
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:31:53 UTC 2021 Added Files: src/sys/external/bsd/drm2/include/trace/events: dma_fence.h Log Message: Stub Linux . To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/include/trace/events/dma_fence.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files:
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:32:03 UTC 2021 Modified Files: src/sys/external/bsd/drm2/nouveau: files.nouveau Removed Files: src/sys/external/bsd/drm2/nouveau: nouveau_sysfs.c Log Message: Delete nouveau_sysfs.c, removed upstream. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/external/bsd/drm2/nouveau/files.nouveau cvs rdiff -u -r1.1 -r0 src/sys/external/bsd/drm2/nouveau/nouveau_sysfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:32:03 UTC 2021 Modified Files: src/sys/external/bsd/drm2/nouveau: files.nouveau Removed Files: src/sys/external/bsd/drm2/nouveau: nouveau_sysfs.c Log Message: Delete nouveau_sysfs.c, removed upstream. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/external/bsd/drm2/nouveau/files.nouveau cvs rdiff -u -r1.1 -r0 src/sys/external/bsd/drm2/nouveau/nouveau_sysfs.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/nouveau/files.nouveau diff -u src/sys/external/bsd/drm2/nouveau/files.nouveau:1.31 src/sys/external/bsd/drm2/nouveau/files.nouveau:1.32 --- src/sys/external/bsd/drm2/nouveau/files.nouveau:1.31 Sun Dec 19 00:25:34 2021 +++ src/sys/external/bsd/drm2/nouveau/files.nouveau Sun Dec 19 00:32:03 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.nouveau,v 1.31 2021/12/19 00:25:34 riastradh Exp $ +# $NetBSD: files.nouveau,v 1.32 2021/12/19 00:32:03 riastradh Exp $ version 20180827 @@ -12,7 +12,6 @@ device nouveaufb: nouveaufbbus, drmfb, d attach nouveaufb at nouveaufbbus # Local additions. External sources are listd below. -file external/bsd/drm2/nouveau/nouveau_sysfs.c nouveau file external/bsd/drm2/nouveau/nouveau_vga.c nouveau file external/bsd/drm2/nouveau/nouveaufb.c nouveaufb
