CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Apr 21 03:02:39 UTC 2024 Modified Files: src/sys/external/bsd/drm2/drm: drm_cdevsw.c Log Message: drm(4): Fix st_rdev in stat. dminor->index already has the 64*type adjustment, as allocated in drm_minor_alloc. PR kern/58180 To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/drm/drm_cdevsw.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_cdevsw.c diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.30 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.31 --- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.30 Wed Jul 6 01:12:45 2022 +++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Apr 21 03:02:39 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_cdevsw.c,v 1.30 2022/07/06 01:12:45 riastradh Exp $ */ +/* $NetBSD: drm_cdevsw.c,v 1.31 2024/04/21 03:02:39 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.30 2022/07/06 01:12:45 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.31 2024/04/21 03:02:39 riastradh Exp $"); #include #include @@ -496,7 +496,7 @@ drm_stat(struct file *fp, struct stat *s struct drm_file *const file = fp->f_data; struct drm_minor *const dminor = file->minor; const dev_t devno = makedev(cdevsw_lookup_major(_cdevsw), - 64*dminor->type + dminor->index); + dminor->index); (void)memset(st, 0, sizeof(*st));
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Apr 21 03:02:39 UTC 2024 Modified Files: src/sys/external/bsd/drm2/drm: drm_cdevsw.c Log Message: drm(4): Fix st_rdev in stat. dminor->index already has the 64*type adjustment, as allocated in drm_minor_alloc. PR kern/58180 To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/drm/drm_cdevsw.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: mrg
Date: Tue Aug 15 04:57:36 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/drm: drm_gem_cma_helper.c
Log Message:
avoid uninitialised variable usage in drm_gem_cma_create_internal().
in the case nothing has returned 'error', 'nsegs' and the dma info
are (potentially) uninitialised, so consider this an error.
found by GCC 12.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/drm/drm_gem_cma_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/drm/drm_gem_cma_helper.c
diff -u src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.14 src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.15
--- src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.14 Sat Jul 2 00:26:07 2022
+++ src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c Tue Aug 15 04:57:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem_cma_helper.c,v 1.14 2022/07/02 00:26:07 riastradh Exp $ */
+/* $NetBSD: drm_gem_cma_helper.c,v 1.15 2023/08/15 04:57:36 mrg Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_helper.c,v 1.14 2022/07/02 00:26:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_helper.c,v 1.15 2023/08/15 04:57:36 mrg Exp $");
#include
@@ -44,7 +44,7 @@ drm_gem_cma_create_internal(struct drm_d
struct sg_table *sgt)
{
struct drm_gem_cma_object *obj;
- int error, nsegs;
+ int error = EINVAL, nsegs;
obj = kmem_zalloc(sizeof(*obj), KM_SLEEP);
obj->dmat = ddev->dmat;
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: mrg Date: Tue Aug 15 04:57:36 UTC 2023 Modified Files: src/sys/external/bsd/drm2/drm: drm_gem_cma_helper.c Log Message: avoid uninitialised variable usage in drm_gem_cma_create_internal(). in the case nothing has returned 'error', 'nsegs' and the dma info are (potentially) uninitialised, so consider this an error. found by GCC 12. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/drm/drm_gem_cma_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/drm
Module Name:src
Committed By: riastradh
Date: Thu Sep 1 17:54:48 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/drm: drmfb.c
Log Message:
drmfb: Rework console detection and takeover.
While here, simplify logic by removing an unreachable error branch so
we never have to contemplate unwinding claiming of the console.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/drm/drmfb.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/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.15 src/sys/external/bsd/drm2/drm/drmfb.c:1.16
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.15 Thu Sep 1 12:01:36 2022
+++ src/sys/external/bsd/drm2/drm/drmfb.c Thu Sep 1 17:54:47 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb.c,v 1.15 2022/09/01 12:01:36 riastradh Exp $ */
+/* $NetBSD: drmfb.c,v 1.16 2022/09/01 17:54:47 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.15 2022/09/01 12:01:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.16 2022/09/01 17:54:47 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -94,9 +94,8 @@ drmfb_attach(struct drmfb_softc *sc, con
#endif
static const struct genfb_ops zero_genfb_ops;
struct genfb_ops genfb_ops = zero_genfb_ops;
- enum { CONS_VGA, CONS_GENFB, CONS_NONE } what_was_cons;
bool is_console;
- int error;
+ int error __diagused;
/* genfb requires this. */
KASSERTMSG((void *)>sc_genfb == device_private(da->da_dev),
@@ -116,29 +115,35 @@ drmfb_attach(struct drmfb_softc *sc, con
prop_dictionary_set_uint64(dict, "mode_callback",
(uint64_t)(uintptr_t)_genfb_mode_callback);
+ /*
+ * Determine whether MD firmware logic has set the console to
+ * go through this device.
+ */
if (prop_dictionary_get_bool(pdict, "is_console", _console)) {
- what_was_cons = CONS_NONE;
- prop_dictionary_set_bool(dict, "is_console", is_console);
+ /* nothing */
+ } else if (genfb_is_console() && genfb_is_enabled()) {
+ is_console = true;
} else {
- /* XXX Whattakludge! */
+ is_console = false;
+ }
+
#if NVGA > 0
- if ((da->da_params->dp_is_vga_console != NULL) &&
- (*da->da_params->dp_is_vga_console)(dev)) {
- what_was_cons = CONS_VGA;
- prop_dictionary_set_bool(dict, "is_console", true);
- vga_cndetach();
- if (da->da_params->dp_disable_vga)
-(*da->da_params->dp_disable_vga)(dev);
- } else
-#endif
- if (genfb_is_console() && genfb_is_enabled()) {
- what_was_cons = CONS_GENFB;
- prop_dictionary_set_bool(dict, "is_console", true);
- } else {
- what_was_cons = CONS_NONE;
- prop_dictionary_set_bool(dict, "is_console", false);
- }
+ /*
+ * Whether or not we were told to be the console, if the
+ * console was configured to go through a vga resource that we
+ * now own and that vga(4) is not going to take over, kick out
+ * the vga console before we take over as genfb console.
+ */
+ if ((da->da_params->dp_is_vga_console != NULL) &&
+ (*da->da_params->dp_is_vga_console)(dev)) {
+ vga_cndetach();
+ if (da->da_params->dp_disable_vga)
+ (*da->da_params->dp_disable_vga)(dev);
+ is_console = true;
}
+#endif
+
+ prop_dictionary_set_bool(dict, "is_console", is_console);
/* Make the first EDID we find available to wsfb */
drm_connector_list_iter_begin(da->da_fb_helper->dev, _iter);
@@ -162,28 +167,10 @@ drmfb_attach(struct drmfb_softc *sc, con
KERNEL_LOCK(1, NULL);
error = genfb_attach(>sc_genfb, _ops);
KERNEL_UNLOCK_ONE(NULL);
- if (error) {
- aprint_error_dev(sc->sc_da.da_dev,
- "failed to attach genfb: %d\n", error);
- goto fail0;
- }
+ KASSERTMSG(error == 0, "genfb_attach failed, error=%d", error);
/* Success! */
return 0;
-
-fail0: KASSERT(error);
- /* XXX Restore console... */
- switch (what_was_cons) {
- case CONS_VGA:
- break;
- case CONS_GENFB:
- break;
- case CONS_NONE:
- break;
- default:
- break;
- }
- return error;
}
int
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Thu Sep 1 17:54:48 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: drmfb.c Log Message: drmfb: Rework console detection and takeover. While here, simplify logic by removing an unreachable error branch so we never have to contemplate unwinding claiming of the console. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/drm/drmfb.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: Thu Sep 1 12:01:36 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/drm: drmfb.c
Log Message:
drmfb: Take is_console property from parent, not from self.
The parent is the pci or platform device that firmware knows about.
The `drmfb' device is more of a fictitious invention of the drm stack
that exists for the convenience of the genfb abstraction which needs
device_private to be a struct genfb_softc.
Let's see if this does any better than the last attempt to rework the
logic here.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/drm/drmfb.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/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.14 src/sys/external/bsd/drm2/drm/drmfb.c:1.15
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.14 Fri Feb 18 18:31:18 2022
+++ src/sys/external/bsd/drm2/drm/drmfb.c Thu Sep 1 12:01:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb.c,v 1.14 2022/02/18 18:31:18 wiz Exp $ */
+/* $NetBSD: drmfb.c,v 1.15 2022/09/01 12:01:36 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.14 2022/02/18 18:31:18 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.15 2022/09/01 12:01:36 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -87,6 +87,8 @@ drmfb_attach(struct drmfb_softc *sc, con
struct drm_connector_list_iter conn_iter;
struct drm_connector *connector;
const prop_dictionary_t dict = device_properties(da->da_dev);
+ const device_t parent = device_parent(da->da_dev);
+ const prop_dictionary_t pdict = device_properties(parent);
#if NVGA > 0
struct drm_device *const dev = da->da_fb_helper->dev;
#endif
@@ -114,7 +116,10 @@ drmfb_attach(struct drmfb_softc *sc, con
prop_dictionary_set_uint64(dict, "mode_callback",
(uint64_t)(uintptr_t)_genfb_mode_callback);
- if (!prop_dictionary_get_bool(dict, "is_console", _console)) {
+ if (prop_dictionary_get_bool(pdict, "is_console", _console)) {
+ what_was_cons = CONS_NONE;
+ prop_dictionary_set_bool(dict, "is_console", is_console);
+ } else {
/* XXX Whattakludge! */
#if NVGA > 0
if ((da->da_params->dp_is_vga_console != NULL) &&
@@ -133,8 +138,6 @@ drmfb_attach(struct drmfb_softc *sc, con
what_was_cons = CONS_NONE;
prop_dictionary_set_bool(dict, "is_console", false);
}
- } else {
- what_was_cons = CONS_NONE;
}
/* Make the first EDID we find available to wsfb */
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Thu Sep 1 12:01:36 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: drmfb.c Log Message: drmfb: Take is_console property from parent, not from self. The parent is the pci or platform device that firmware knows about. The `drmfb' device is more of a fictitious invention of the drm stack that exists for the convenience of the genfb abstraction which needs device_private to be a struct genfb_softc. Let's see if this does any better than the last attempt to rework the logic here. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/drm/drmfb.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: Thu Jul 28 10:43:36 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drmkms_sched: Remove duplicate module definition. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 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.81 src/sys/external/bsd/drm2/drm/files.drmkms:1.82 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.81 Sun Jul 24 19:23:59 2022 +++ src/sys/external/bsd/drm2/drm/files.drmkms Thu Jul 28 10:43:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.81 2022/07/24 19:23:59 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.82 2022/07/28 10:43:35 riastradh Exp $ version 20180827 @@ -104,7 +104,6 @@ makeoptions drmkms_sched "CPPFLAGS.drmkm file external/bsd/drm2/dist/drm/scheduler/sched_entity.c drmkms_sched file external/bsd/drm2/dist/drm/scheduler/sched_fence.c drmkms_sched file external/bsd/drm2/dist/drm/scheduler/sched_main.c drmkms_sched -file external/bsd/drm2/drm/sched_module.c drmkms_sched # Generated from drm2netbsd. #file external/bsd/drm2/dist/drm/drm_agpsupport.c drmkms # drmkms_pci
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Thu Jul 28 10:43:36 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drmkms_sched: Remove duplicate module definition. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 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 Jul 24 19:24:00 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
Log Message:
drm: Fix CPPFLAGS for drm scheduler code.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 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.80 src/sys/external/bsd/drm2/drm/files.drmkms:1.81
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.80 Sat Jul 23 12:52:10 2022
+++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Jul 24 19:23:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.80 2022/07/23 12:52:10 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.81 2022/07/24 19:23:59 riastradh Exp $
version 20180827
@@ -99,7 +99,7 @@ file external/bsd/drm2/drm/drm_scatter.c
# GPU scheduler
define drmkms_sched: drmkms
-makeoptions drmkms_sched "CPPFLAGS.drmsched"+="${CPPFLAGS.drmkms}"
+makeoptions drmkms_sched "CPPFLAGS.drmkms_sched"+="${CPPFLAGS.drmkms}"
file external/bsd/drm2/dist/drm/scheduler/sched_entity.c drmkms_sched
file external/bsd/drm2/dist/drm/scheduler/sched_fence.c drmkms_sched
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Jul 24 19:24:00 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Fix CPPFLAGS for drm scheduler code. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 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: Wed Jul 20 10:01:01 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Keep drm include flags in CPPFLAGS.drmkms after all. Failures from this are much more obvious to debug than files with missing #ifdefs, which sometimes lead to build failures but could also just lead to silent miscompilation. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 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.78 src/sys/external/bsd/drm2/drm/files.drmkms:1.79 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.78 Wed Jul 20 01:38:24 2022 +++ src/sys/external/bsd/drm2/drm/files.drmkms Wed Jul 20 10:01:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.78 2022/07/20 01:38:24 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.79 2022/07/20 10:01:01 riastradh Exp $ version 20180827 @@ -17,15 +17,15 @@ define drmkms: drmkms_linux, drmkms_i2c, makeoptions drmkms "COPTS.drmkms"+="-fwrapv" # Overrides first. -makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include" -makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include/drm" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include/drm" -makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/common/include" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/common/include" # 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/include/uapi" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/drm" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/uapi" makeoptions drmkms "CPPFLAGS.drmkms"+="-D__KERNEL__"
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Wed Jul 20 10:01:01 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Keep drm include flags in CPPFLAGS.drmkms after all. Failures from this are much more obvious to debug than files with missing #ifdefs, which sometimes lead to build failures but could also just lead to silent miscompilation. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 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.
Re: CVS commit: src/sys/external/bsd/drm2/drm
> On Jul 19, 2022, at 10:14 PM, matthew green wrote: > > looks like only a small number of files check for "alpha" > vs "__alpha__" currently, and all can likely be switched. Yah, and some I should just fix. -- thorpej
re: CVS commit: src/sys/external/bsd/drm2/drm
"Taylor R Campbell" writes:
> Module Name: src
> Committed By: riastradh
> Date: Tue Jul 19 23:19:35 UTC 2022
>
> Modified Files:
> src/sys/external/bsd/drm2/drm: files.drmkms
>
> Log Message:
> drm: Undefine `alpha' in CPPFLAGS. Causes lotsa trouble!
>
> But don't undefine it outside drmkms; `#ifdef alpha' or equivalent is
> used elsewhere in-tree. (Maybe it should be replaced by __alpha__.)
welcome to -D${MACHINE}. this isn't the compiler, but our
build framework we inherited a long long time ago :-)
looks like only a small number of files check for "alpha"
vs "__alpha__" currently, and all can likely be switched.
.mrg.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Wed Jul 20 01:38:24 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Restore pollution of CPPFLAGS with include directories. Too much trouble to make this fine-grained. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 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.77 src/sys/external/bsd/drm2/drm/files.drmkms:1.78 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.77 Tue Jul 19 23:19:35 2022 +++ src/sys/external/bsd/drm2/drm/files.drmkms Wed Jul 20 01:38:24 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.77 2022/07/19 23:19:35 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.78 2022/07/20 01:38:24 riastradh Exp $ version 20180827 @@ -17,15 +17,15 @@ define drmkms: drmkms_linux, drmkms_i2c, makeoptions drmkms "COPTS.drmkms"+="-fwrapv" # Overrides first. -makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include" -makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include/drm" +makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include" +makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include/drm" -makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/common/include" +makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/common/include" # Then upstream. -makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include" -makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/drm" -makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/uapi" +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/include/uapi" makeoptions drmkms "CPPFLAGS.drmkms"+="-D__KERNEL__"
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Wed Jul 20 01:38:24 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Restore pollution of CPPFLAGS with include directories. Too much trouble to make this fine-grained. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 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: Tue Jul 19 23:19:35 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Undefine `alpha' in CPPFLAGS. Causes lotsa trouble! But don't undefine it outside drmkms; `#ifdef alpha' or equivalent is used elsewhere in-tree. (Maybe it should be replaced by __alpha__.) To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 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.76 src/sys/external/bsd/drm2/drm/files.drmkms:1.77 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.76 Tue Jul 19 23:19:17 2022 +++ src/sys/external/bsd/drm2/drm/files.drmkms Tue Jul 19 23:19:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.76 2022/07/19 23:19:17 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.77 2022/07/19 23:19:35 riastradh Exp $ version 20180827 @@ -40,6 +40,8 @@ elifdef arm makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_ARM" elifdef aarch64 makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_ARM64" +elifdef alpha +makeoptions drmkms "CPPFLAGS.drmkms"+="-Ualpha" endif makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Tue Jul 19 23:19:35 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Undefine `alpha' in CPPFLAGS. Causes lotsa trouble! But don't undefine it outside drmkms; `#ifdef alpha' or equivalent is used elsewhere in-tree. (Maybe it should be replaced by __alpha__.) To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 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: Tue Jul 19 23:19:27 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: drm_cache.c Log Message: drm: Make drm_clflush_* noop on alpha. As far as I know there is no need for this; the CPU has weak ordering on loads and stores requiring ordering barriers, but I/O devices participate in the CPU's cache protocol for access to main memory so there's never any need for explicit cache flushes. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/drm/drm_cache.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_cache.c diff -u src/sys/external/bsd/drm2/drm/drm_cache.c:1.18 src/sys/external/bsd/drm2/drm/drm_cache.c:1.19 --- src/sys/external/bsd/drm2/drm/drm_cache.c:1.18 Sun Dec 19 11:33:30 2021 +++ src/sys/external/bsd/drm2/drm/drm_cache.c Tue Jul 19 23:19:27 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_cache.c,v 1.18 2021/12/19 11:33:30 riastradh Exp $ */ +/* $NetBSD: drm_cache.c,v 1.19 2022/07/19 23:19:27 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_cache.c,v 1.18 2021/12/19 11:33:30 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_cache.c,v 1.19 2022/07/19 23:19:27 riastradh Exp $"); #include #include @@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_cache.c, #include -#if !defined(__arm__) && !defined(__aarch64__) +#if !defined(__arm__) && !defined(__aarch64__) && !defined(__alpha__) #define DRM_CLFLUSH 1 #endif
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Tue Jul 19 23:19:27 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: drm_cache.c Log Message: drm: Make drm_clflush_* noop on alpha. As far as I know there is no need for this; the CPU has weak ordering on loads and stores requiring ordering barriers, but I/O devices participate in the CPU's cache protocol for access to main memory so there's never any need for explicit cache flushes. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/drm/drm_cache.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: Tue Jul 19 23:19:17 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Narrow scope of drm CPPLAGS just to drm files. No need for various Linux compat definitions elsewhere in the kernel. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 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.75 src/sys/external/bsd/drm2/drm/files.drmkms:1.76 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.75 Tue Jul 19 23:19:06 2022 +++ src/sys/external/bsd/drm2/drm/files.drmkms Tue Jul 19 23:19:17 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.75 2022/07/19 23:19:06 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.76 2022/07/19 23:19:17 riastradh Exp $ version 20180827 @@ -17,38 +17,38 @@ define drmkms: drmkms_linux, drmkms_i2c, makeoptions drmkms "COPTS.drmkms"+="-fwrapv" # Overrides first. -makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include" -makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include/drm" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include/drm" -makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/common/include" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/common/include" # 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/include/uapi" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/drm" +makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/uapi" -makeoptions drmkms CPPFLAGS+="-D__KERNEL__" +makeoptions drmkms "CPPFLAGS.drmkms"+="-D__KERNEL__" ifdef i386 -makeoptions drmkms CPPFLAGS+="-DCONFIG_X86" -makeoptions drmkms CPPFLAGS+="-DCONFIG_X86_PAT" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_X86" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_X86_PAT" elifdef amd64 -makeoptions drmkms CPPFLAGS+="-DCONFIG_X86" -makeoptions drmkms CPPFLAGS+="-DCONFIG_X86_64" -makeoptions drmkms CPPFLAGS+="-DCONFIG_X86_PAT" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_X86" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_X86_64" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_X86_PAT" elifdef arm -makeoptions drmkms CPPFLAGS+="-DCONFIG_ARM" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_ARM" elifdef aarch64 -makeoptions drmkms CPPFLAGS+="-DCONFIG_ARM64" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_ARM64" endif -makeoptions drmkms CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0" -makeoptions drmkms CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0" -makeoptions drmkms CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1" -makeoptions drmkms CPPFLAGS+="-DCONFIG_DRM_FBDEV_OVERALLOC=100" -makeoptions drmkms CPPFLAGS+="-DCONFIG_FB=0" -makeoptions drmkms CPPFLAGS+="-DCONFIG_LOCKDEP=0" -makeoptions drmkms CPPFLAGS+="-DCONFIG_PCI=1" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_DRM_FBDEV_EMULATION=1" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_DRM_FBDEV_OVERALLOC=100" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_FB=0" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_LOCKDEP=0" +makeoptions drmkms "CPPFLAGS.drmkms"+="-DCONFIG_PCI=1" makeoptions drmkms "CWARNFLAGS.drmkms"+="-Wno-missing-field-initializers"
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Tue Jul 19 23:19:17 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Narrow scope of drm CPPLAGS just to drm files. No need for various Linux compat definitions elsewhere in the kernel. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 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: Tue Jul 19 22:24:48 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: drm_module.c files.drmkms Log Message: drm: Note dependency on sysmon_power. drm uses this for pswitch events to notify of hotplug. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/drm/drm_module.c cvs rdiff -u -r1.73 -r1.74 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/drm_module.c diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.30 src/sys/external/bsd/drm2/drm/drm_module.c:1.31 --- src/sys/external/bsd/drm2/drm/drm_module.c:1.30 Sun Jul 17 14:11:40 2022 +++ src/sys/external/bsd/drm2/drm/drm_module.c Tue Jul 19 22:24:47 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_module.c,v 1.30 2022/07/17 14:11:40 riastradh Exp $ */ +/* $NetBSD: drm_module.c,v 1.31 2022/07/19 22:24:47 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.30 2022/07/17 14:11:40 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.31 2022/07/19 22:24:47 riastradh Exp $"); #include #include @@ -94,7 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_module.c /* * XXX I2C stuff should be moved to a separate drmkms_i2c module. */ -MODULE(MODULE_CLASS_DRIVER, drmkms, "drmkms_linux"); +MODULE(MODULE_CLASS_DRIVER, drmkms, "drmkms_linux,sysmon_power"); struct mutex drm_global_mutex; Index: src/sys/external/bsd/drm2/drm/files.drmkms diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.73 src/sys/external/bsd/drm2/drm/files.drmkms:1.74 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.73 Sun May 22 00:10:56 2022 +++ src/sys/external/bsd/drm2/drm/files.drmkms Tue Jul 19 22:24:47 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.73 2022/05/22 00:10:56 tnn Exp $ +# $NetBSD: files.drmkms,v 1.74 2022/07/19 22:24:47 riastradh Exp $ version 20180827 @@ -10,7 +10,7 @@ include "external/bsd/drm2/linux/files.d # ARM SoC graphics drivers. define drmkms_i2c: drmkms_linux -define drmkms: drmkms_linux, drmkms_i2c, linux +define drmkms: drmkms_linux, drmkms_i2c, linux, sysmon_power # This code comes from the Linux kernel, which assumes signed # overflow is OK.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Tue Jul 19 22:24:48 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: drm_module.c files.drmkms Log Message: drm: Note dependency on sysmon_power. drm uses this for pswitch events to notify of hotplug. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/drm/drm_module.c cvs rdiff -u -r1.73 -r1.74 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: tnn Date: Sun May 22 00:10:56 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: rename CONFIG_AARCH64 to CONFIG_ARM64 which is what upstream code expects To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 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: tnn Date: Sun May 22 00:10:56 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: rename CONFIG_AARCH64 to CONFIG_ARM64 which is what upstream code expects To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 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.72 src/sys/external/bsd/drm2/drm/files.drmkms:1.73 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.72 Tue Dec 21 12:55:23 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun May 22 00:10:56 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.72 2021/12/21 12:55:23 tnn Exp $ +# $NetBSD: files.drmkms,v 1.73 2022/05/22 00:10:56 tnn Exp $ version 20180827 @@ -39,7 +39,7 @@ makeoptions drmkms CPPFLAGS+="-DCONFIG_X elifdef arm makeoptions drmkms CPPFLAGS+="-DCONFIG_ARM" elifdef aarch64 -makeoptions drmkms CPPFLAGS+="-DCONFIG_AARCH64" +makeoptions drmkms CPPFLAGS+="-DCONFIG_ARM64" endif makeoptions drmkms CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src
Committed By: wiz
Date: Fri Feb 18 18:31:19 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/drm: drmfb.c
Log Message:
revert "drm: Respect is_console property on main drm device, not fb child."
breaks booting on some machines
ok riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/drm/drmfb.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/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.13 src/sys/external/bsd/drm2/drm/drmfb.c:1.14
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.13 Wed Feb 16 23:30:10 2022
+++ src/sys/external/bsd/drm2/drm/drmfb.c Fri Feb 18 18:31:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb.c,v 1.13 2022/02/16 23:30:10 riastradh Exp $ */
+/* $NetBSD: drmfb.c,v 1.14 2022/02/18 18:31:18 wiz Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.13 2022/02/16 23:30:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.14 2022/02/18 18:31:18 wiz Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -93,7 +93,6 @@ drmfb_attach(struct drmfb_softc *sc, con
static const struct genfb_ops zero_genfb_ops;
struct genfb_ops genfb_ops = zero_genfb_ops;
enum { CONS_VGA, CONS_GENFB, CONS_NONE } what_was_cons;
- device_t parent = device_parent(da->da_dev);
bool is_console;
int error;
@@ -115,9 +114,7 @@ drmfb_attach(struct drmfb_softc *sc, con
prop_dictionary_set_uint64(dict, "mode_callback",
(uint64_t)(uintptr_t)_genfb_mode_callback);
- if (!prop_dictionary_get_bool(dict, "is_console", _console) &&
- !prop_dictionary_get_bool(device_properties(parent), "is_console",
- _console)) {
+ if (!prop_dictionary_get_bool(dict, "is_console", _console)) {
/* XXX Whattakludge! */
#if NVGA > 0
if ((da->da_params->dp_is_vga_console != NULL) &&
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: wiz Date: Fri Feb 18 18:31:19 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: drmfb.c Log Message: revert "drm: Respect is_console property on main drm device, not fb child." breaks booting on some machines ok riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/drm/drmfb.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: Wed Feb 16 23:30:10 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/drm: drmfb.c
Log Message:
drm: Respect is_console property on main drm device, not fb child.
The MD device enumeration sets the property on, e.g., PCI devices --
not on drm framebuffer children, which are mostly a software
abstraction. Not sure examining the nouveaufb, intelfb, , device
properties is worthwhile at all, but in case it breaks something
let's just leave it in while we're fixing other things.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/drm/drmfb.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/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.12 src/sys/external/bsd/drm2/drm/drmfb.c:1.13
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.12 Mon Dec 20 20:34:59 2021
+++ src/sys/external/bsd/drm2/drm/drmfb.c Wed Feb 16 23:30:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb.c,v 1.12 2021/12/20 20:34:59 chs Exp $ */
+/* $NetBSD: drmfb.c,v 1.13 2022/02/16 23:30:10 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.12 2021/12/20 20:34:59 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.13 2022/02/16 23:30:10 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -93,6 +93,7 @@ drmfb_attach(struct drmfb_softc *sc, con
static const struct genfb_ops zero_genfb_ops;
struct genfb_ops genfb_ops = zero_genfb_ops;
enum { CONS_VGA, CONS_GENFB, CONS_NONE } what_was_cons;
+ device_t parent = device_parent(da->da_dev);
bool is_console;
int error;
@@ -114,7 +115,9 @@ drmfb_attach(struct drmfb_softc *sc, con
prop_dictionary_set_uint64(dict, "mode_callback",
(uint64_t)(uintptr_t)_genfb_mode_callback);
- if (!prop_dictionary_get_bool(dict, "is_console", _console)) {
+ if (!prop_dictionary_get_bool(dict, "is_console", _console) &&
+ !prop_dictionary_get_bool(device_properties(parent), "is_console",
+ _console)) {
/* XXX Whattakludge! */
#if NVGA > 0
if ((da->da_params->dp_is_vga_console != NULL) &&
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Wed Feb 16 23:30:10 UTC 2022 Modified Files: src/sys/external/bsd/drm2/drm: drmfb.c Log Message: drm: Respect is_console property on main drm device, not fb child. The MD device enumeration sets the property on, e.g., PCI devices -- not on drm framebuffer children, which are mostly a software abstraction. Not sure examining the nouveaufb, intelfb, , device properties is worthwhile at all, but in case it breaks something let's just leave it in while we're fixing other things. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/drm/drmfb.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: Fri Dec 31 17:22:45 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_module.c Log Message: drm: Reduce default debug level to driver-specific messages. Let's make a little less log spew by default with `boot -x'. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/drm/drm_module.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_module.c diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.28 src/sys/external/bsd/drm2/drm/drm_module.c:1.29 --- src/sys/external/bsd/drm2/drm/drm_module.c:1.28 Sun Dec 19 12:43:37 2021 +++ src/sys/external/bsd/drm2/drm/drm_module.c Fri Dec 31 17:22:45 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_module.c,v 1.28 2021/12/19 12:43:37 riastradh Exp $ */ +/* $NetBSD: drm_module.c,v 1.29 2021/12/31 17:22:45 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.28 2021/12/19 12:43:37 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.29 2021/12/31 17:22:45 riastradh Exp $"); #include #include @@ -124,7 +124,7 @@ drm_init(void) #endif if (ISSET(boothowto, AB_DEBUG)) - __drm_debug = DRM_UT_CORE | DRM_UT_DRIVER | DRM_UT_KMS | DRM_UT_ATOMIC; + __drm_debug = DRM_UT_DRIVER; spin_lock_init(_minor_lock); idr_init(_minors_idr);
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Fri Dec 31 17:22:45 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_module.c Log Message: drm: Reduce default debug level to driver-specific messages. Let's make a little less log spew by default with `boot -x'. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/drm/drm_module.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: Mon Dec 20 00:27:53 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drmfb.c
Log Message:
drm: Simplify use of drm API for display on/off logic in drmfb.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/drm/drmfb.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/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.10 src/sys/external/bsd/drm2/drm/drmfb.c:1.11
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.10 Sun Dec 19 10:32:59 2021
+++ src/sys/external/bsd/drm2/drm/drmfb.c Mon Dec 20 00:27:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $ */
+/* $NetBSD: drmfb.c,v 1.11 2021/12/20 00:27:53 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.11 2021/12/20 00:27:53 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -196,8 +196,6 @@ drmfb_genfb_ioctl(void *v, void *vs, uns
struct genfb_softc *const genfb = v;
struct drmfb_softc *const sc = container_of(genfb, struct drmfb_softc,
sc_genfb);
- struct drm_connector_list_iter conn_iter;
- struct drm_connector *connector;
int error;
if (sc->sc_da.da_params->dp_ioctl) {
@@ -227,17 +225,10 @@ drmfb_genfb_ioctl(void *v, void *vs, uns
const int on = *(const int *)data;
const int dpms_mode = on? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF;
struct drm_fb_helper *const fb_helper = sc->sc_da.da_fb_helper;
- struct drm_device *const dev = fb_helper->dev;
- drm_modeset_lock_all(dev);
- drm_connector_list_iter_begin(fb_helper->dev, _iter);
- drm_client_for_each_connector_iter(connector, _iter) {
- (*connector->funcs->dpms)(connector, dpms_mode);
- drm_object_property_set_value(>base,
- dev->mode_config.dpms_property, dpms_mode);
- }
- drm_connector_list_iter_end(_iter);
- drm_modeset_unlock_all(dev);
+ mutex_lock(_helper->lock);
+ drm_client_modeset_dpms(_helper->client, dpms_mode);
+ mutex_unlock(_helper->lock);
return 0;
}
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Mon Dec 20 00:27:53 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drmfb.c Log Message: drm: Simplify use of drm API for display on/off logic in drmfb. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/drm/drmfb.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 12:30:31 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_sysfs.c
Log Message:
drm: Fill in fake connector->kdev pointing at the drm device.
Hope this will make progress -- hope it won't screw up too badly if
two connectors have the same kdev!
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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_sysfs.c
diff -u src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.8 src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.9
--- src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.8 Sun Dec 19 10:39:42 2021
+++ src/sys/external/bsd/drm2/drm/drm_sysfs.c Sun Dec 19 12:30:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_sysfs.c,v 1.8 2021/12/19 10:39:42 riastradh Exp $ */
+/* $NetBSD: drm_sysfs.c,v 1.9 2021/12/19 12:30:31 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,8 +30,10 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,v 1.8 2021/12/19 10:39:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,v 1.9 2021/12/19 12:30:31 riastradh Exp $");
+#include
+#include
#include
#include "../dist/drm/drm_internal.h"
@@ -39,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,
int
drm_sysfs_connector_add(struct drm_connector *connector)
{
+ connector->kdev = connector->dev->dev; /* XXX */
return 0;
}
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 12:30:31 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_sysfs.c Log Message: drm: Fill in fake connector->kdev pointing at the drm device. Hope this will make progress -- hope it won't screw up too badly if two connectors have the same kdev! To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 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 11:53:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Place drm_hdcp.c like other overrides in files.drmkms. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 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.67 src/sys/external/bsd/drm2/drm/files.drmkms:1.68 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.67 Sun Dec 19 11:49:35 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 11:53:41 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.67 2021/12/19 11:49:35 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.68 2021/12/19 11:53:41 riastradh Exp $ version 20180827 @@ -56,7 +56,6 @@ makeoptions drmkms "CWARNFLAGS.drmkms"+= file external/bsd/drm2/drm/drm_agp_hook.c drmkms file external/bsd/drm2/drm/drm_cdevsw.c drmkms file external/bsd/drm2/drm/drm_gem_vm.c drmkms -file external/bsd/drm2/drm/drm_hdcp.c drmkms file external/bsd/drm2/drm/drm_module.c drmkms file external/bsd/drm2/drm/drm_stub.c !drmkms & !drmbase file external/bsd/drm2/drm/drm_sysctl.c drmkms @@ -128,7 +127,7 @@ file external/bsd/drm2/dist/drm/drm_gem. file external/bsd/drm2/drm/drm_gem_cma_helper.c drmkms file external/bsd/drm2/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/drm/drm_hdcp.c drmkms 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
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:53:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: drm: Place drm_hdcp.c like other overrides in files.drmkms. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 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 11:49:35 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
Added Files:
src/sys/external/bsd/drm2/drm: drm_hdcp.c
Log Message:
drm: Stub out drm_hdcp.c
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/drm/drm_hdcp.c
cvs rdiff -u -r1.66 -r1.67 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.66 src/sys/external/bsd/drm2/drm/files.drmkms:1.67
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.66 Sun Dec 19 11:09:47 2021
+++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 11:49:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.66 2021/12/19 11:09:47 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.67 2021/12/19 11:49:35 riastradh Exp $
version 20180827
@@ -56,6 +56,7 @@ makeoptions drmkms "CWARNFLAGS.drmkms"+=
file external/bsd/drm2/drm/drm_agp_hook.c drmkms
file external/bsd/drm2/drm/drm_cdevsw.c drmkms
file external/bsd/drm2/drm/drm_gem_vm.c drmkms
+file external/bsd/drm2/drm/drm_hdcp.c drmkms
file external/bsd/drm2/drm/drm_module.c drmkms
file external/bsd/drm2/drm/drm_stub.c !drmkms & !drmbase
file external/bsd/drm2/drm/drm_sysctl.c drmkms
Added files:
Index: src/sys/external/bsd/drm2/drm/drm_hdcp.c
diff -u /dev/null src/sys/external/bsd/drm2/drm/drm_hdcp.c:1.1
--- /dev/null Sun Dec 19 11:49:35 2021
+++ src/sys/external/bsd/drm2/drm/drm_hdcp.c Sun Dec 19 11:49:35 2021
@@ -0,0 +1,54 @@
+/* $NetBSD: drm_hdcp.c,v 1.1 2021/12/19 11:49:35 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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_hdcp.c,v 1.1 2021/12/19 11:49:35 riastradh Exp $");
+
+#include
+
+#include
+
+bool
+drm_hdcp_check_ksvs_revoked(struct drm_device *dev, u8 *ksvs, u32 ksv_count)
+{
+
+ return false;
+}
+
+int
+drm_connector_attach_content_protection_property(
+struct drm_connector *connector, bool hdcp_content_type)
+{
+
+ return -ENOSYS;
+}
+
+void
+drm_hdcp_update_content_protection(struct drm_connector *connector, u64 val)
+{
+}
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:49:35 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Added Files: src/sys/external/bsd/drm2/drm: drm_hdcp.c Log Message: drm: Stub out drm_hdcp.c To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/drm/drm_hdcp.c cvs rdiff -u -r1.66 -r1.67 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 11:36:41 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_cdevsw.c
Log Message:
drm: Omit bogus __unused attributes.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/drm2/drm/drm_cdevsw.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_cdevsw.c
diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.27 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.28
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.27 Sun Dec 19 11:08:55 2021
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Dec 19 11:36:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cdevsw.c,v 1.27 2021/12/19 11:08:55 riastradh Exp $ */
+/* $NetBSD: drm_cdevsw.c,v 1.28 2021/12/19 11:36:41 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.27 2021/12/19 11:08:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.28 2021/12/19 11:36:41 riastradh Exp $");
#include
#include
@@ -398,7 +398,7 @@ drm_ioctl_shim(struct file *fp, unsigned
}
static int
-drm_poll(struct file *fp __unused, int events __unused)
+drm_poll(struct file *fp, int events)
{
struct drm_file *const file = fp->f_data;
struct drm_device *const dev = file->minor->dev;
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:36:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_cdevsw.c Log Message: drm: Omit bogus __unused attributes. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/drm2/drm/drm_cdevsw.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 11:34:20 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_vma_manager.c Log Message: drm: Fix sign error in comparison for vma lookup. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_vma_manager.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_vma_manager.c diff -u src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.6 src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.7 --- src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.6 Sun Dec 19 01:02:02 2021 +++ src/sys/external/bsd/drm2/drm/drm_vma_manager.c Sun Dec 19 11:34:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_vma_manager.c,v 1.6 2021/12/19 01:02:02 riastradh Exp $ */ +/* $NetBSD: drm_vma_manager.c,v 1.7 2021/12/19 11:34:20 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_vma_manager.c,v 1.6 2021/12/19 01:02:02 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_vma_manager.c,v 1.7 2021/12/19 11:34:20 riastradh Exp $"); #include #include @@ -233,7 +233,7 @@ drm_vma_offset_lookup_locked(struct drm_ if (node == NULL) return NULL; KASSERT(node->von_startpage <= startpage); - if (npages < node->von_npages) + if (node->von_npages < npages) return NULL; if (node->von_npages - npages < startpage - node->von_startpage) return NULL;
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:34:20 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_vma_manager.c Log Message: drm: Fix sign error in comparison for vma lookup. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_vma_manager.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 11:08:55 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_cdevsw.c Log Message: Initialize priv->filp, lost in removing drm_fops.c Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/drm2/drm/drm_cdevsw.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_cdevsw.c diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.26 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.27 --- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.26 Sun Dec 19 10:45:33 2021 +++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Dec 19 11:08:55 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_cdevsw.c,v 1.26 2021/12/19 10:45:33 riastradh Exp $ */ +/* $NetBSD: drm_cdevsw.c,v 1.27 2021/12/19 11:08:55 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.26 2021/12/19 10:45:33 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.27 2021/12/19 11:08:55 riastradh Exp $"); #include #include @@ -177,6 +177,7 @@ drm_open(dev_t d, int flags, int fmt, st if (error) goto fail4; } + priv->filp = fp; mutex_lock(>filelist_mutex); list_add(>lhead, >filelist);
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:08:55 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_cdevsw.c Log Message: Initialize priv->filp, lost in removing drm_fops.c Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/drm2/drm/drm_cdevsw.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 11:08:47 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_lease.c
Log Message:
stub drm_lease.c the same way as openbsd
Author: Maya Rashish
Committer: Taylor R Campbell
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drm_lease.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_lease.c
diff -u src/sys/external/bsd/drm2/drm/drm_lease.c:1.4 src/sys/external/bsd/drm2/drm/drm_lease.c:1.5
--- src/sys/external/bsd/drm2/drm/drm_lease.c:1.4 Sun Dec 19 10:46:09 2021
+++ src/sys/external/bsd/drm2/drm/drm_lease.c Sun Dec 19 11:08:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_lease.c,v 1.4 2021/12/19 10:46:09 riastradh Exp $ */
+/* $NetBSD: drm_lease.c,v 1.5 2021/12/19 11:08:47 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_lease.c,v 1.4 2021/12/19 10:46:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_lease.c,v 1.5 2021/12/19 11:08:47 riastradh Exp $");
#include
#include
@@ -90,7 +90,7 @@ drm_lease_held(struct drm_file *file, in
bool
_drm_lease_held(struct drm_file *file, int id)
{
- panic("%s: not yet implemented", __func__);
+ return true;
}
/*
@@ -101,7 +101,6 @@ _drm_lease_held(struct drm_file *file, i
void
drm_lease_revoke(struct drm_master *master)
{
- panic("%s: not yet implemented", __func__);
}
/*
@@ -112,7 +111,7 @@ drm_lease_revoke(struct drm_master *mast
uint32_t
drm_lease_filter_crtcs(struct drm_file *file, uint32_t crtcs)
{
- panic("%s: not yet implemented", __func__);
+ return crtcs;
}
/*
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:08:47 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_lease.c Log Message: stub drm_lease.c the same way as openbsd Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drm_lease.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 11:07:56 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_client.c
Log Message:
drm: Unstub drm_client slightly more.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drm_client.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_client.c
diff -u src/sys/external/bsd/drm2/drm/drm_client.c:1.2 src/sys/external/bsd/drm2/drm/drm_client.c:1.3
--- src/sys/external/bsd/drm2/drm/drm_client.c:1.2 Sun Dec 19 11:07:49 2021
+++ src/sys/external/bsd/drm2/drm/drm_client.c Sun Dec 19 11:07:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_client.c,v 1.2 2021/12/19 11:07:49 riastradh Exp $ */
+/* $NetBSD: drm_client.c,v 1.3 2021/12/19 11:07:55 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,22 +30,31 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_client.c,v 1.2 2021/12/19 11:07:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_client.c,v 1.3 2021/12/19 11:07:55 riastradh Exp $");
#include
#include
#include
+#include
int
drm_client_init(struct drm_device *dev, struct drm_client_dev *client,
const char *name, const struct drm_client_funcs *funcs)
{
+ int ret;
client->dev = dev;
+ ret = drm_client_modeset_create(client);
+ if (ret)
+ goto out0;
+
+ drm_dev_get(dev);
return 0;
+
+out0: return ret;
}
void
@@ -56,6 +65,9 @@ drm_client_register(struct drm_client_de
void
drm_client_release(struct drm_client_dev *client)
{
+
+ drm_client_modeset_free(client);
+ drm_dev_put(client->dev);
}
void
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:07:56 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_client.c Log Message: drm: Unstub drm_client slightly more. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drm_client.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 11:07:49 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_client.c
Log Message:
drm: Slightly unstub this toe.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/drm/drm_client.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_client.c
diff -u src/sys/external/bsd/drm2/drm/drm_client.c:1.1 src/sys/external/bsd/drm2/drm/drm_client.c:1.2
--- src/sys/external/bsd/drm2/drm/drm_client.c:1.1 Sun Dec 19 10:46:35 2021
+++ src/sys/external/bsd/drm2/drm/drm_client.c Sun Dec 19 11:07:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_client.c,v 1.1 2021/12/19 10:46:35 riastradh Exp $ */
+/* $NetBSD: drm_client.c,v 1.2 2021/12/19 11:07:49 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_client.c,v 1.1 2021/12/19 10:46:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_client.c,v 1.2 2021/12/19 11:07:49 riastradh Exp $");
#include
@@ -42,6 +42,9 @@ int
drm_client_init(struct drm_device *dev, struct drm_client_dev *client,
const char *name, const struct drm_client_funcs *funcs)
{
+
+ client->dev = dev;
+
return 0;
}
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:07:49 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_client.c Log Message: drm: Slightly unstub this toe. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/drm/drm_client.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 10:46:35 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
Added Files:
src/sys/external/bsd/drm2/drm: drm_client.c
Log Message:
drm_client stubs
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/drm/drm_client.c
cvs rdiff -u -r1.61 -r1.62 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.61 src/sys/external/bsd/drm2/drm/files.drmkms:1.62
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.61 Sun Dec 19 10:46:24 2021
+++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 10:46:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.61 2021/12/19 10:46:24 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.62 2021/12/19 10:46:35 riastradh Exp $
version 20180827
@@ -98,7 +98,7 @@ file external/bsd/drm2/dist/drm/drm_auth
file external/bsd/drm2/dist/drm/drm_blend.c drmkms
file external/bsd/drm2/dist/drm/drm_bridge.c drmkms
file external/bsd/drm2/drm/drm_cache.c drmkms
-#file external/bsd/drm2/dist/drm/drm_client.c drmkms
+file external/bsd/drm2/drm/drm_client.c drmkms
file external/bsd/drm2/dist/drm/drm_client_modeset.c drmkms
file external/bsd/drm2/dist/drm/drm_color_mgmt.c drmkms
file external/bsd/drm2/dist/drm/drm_connector.c drmkms
Added files:
Index: src/sys/external/bsd/drm2/drm/drm_client.c
diff -u /dev/null src/sys/external/bsd/drm2/drm/drm_client.c:1.1
--- /dev/null Sun Dec 19 10:46:35 2021
+++ src/sys/external/bsd/drm2/drm/drm_client.c Sun Dec 19 10:46:35 2021
@@ -0,0 +1,100 @@
+/* $NetBSD: drm_client.c,v 1.1 2021/12/19 10:46:35 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2020 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_client.c,v 1.1 2021/12/19 10:46:35 riastradh Exp $");
+
+#include
+
+#include
+
+#include
+
+int
+drm_client_init(struct drm_device *dev, struct drm_client_dev *client,
+const char *name, const struct drm_client_funcs *funcs)
+{
+ return 0;
+}
+
+void
+drm_client_register(struct drm_client_dev *client)
+{
+}
+
+void
+drm_client_release(struct drm_client_dev *client)
+{
+}
+
+void
+drm_client_dev_hotplug(struct drm_device *dev)
+{
+}
+
+void
+drm_client_dev_restore(struct drm_device *dev)
+{
+}
+
+void
+drm_client_dev_unregister(struct drm_device *dev)
+{
+}
+
+struct drm_client_buffer *
+drm_client_framebuffer_create(struct drm_client_dev *client,
+u32 width, u32 height, u32 format)
+{
+ struct drm_client_buffer *buffer;
+
+ buffer = kmem_zalloc(sizeof(*buffer), KM_SLEEP);
+
+ return buffer;
+}
+
+void *
+drm_client_buffer_vmap(struct drm_client_buffer *buffer)
+{
+ return ERR_PTR(-ENODEV);
+}
+
+void
+drm_client_buffer_vunmap(struct drm_client_buffer *buffer)
+{
+ panic("impossible");
+}
+
+void
+drm_client_framebuffer_delete(struct drm_client_buffer *buffer)
+{
+ kmem_free(buffer, sizeof(*buffer));
+}
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:46:35 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Added Files: src/sys/external/bsd/drm2/drm: drm_client.c Log Message: drm_client stubs To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/drm/drm_client.c cvs rdiff -u -r1.61 -r1.62 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 10:46:24 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Regen and remerge. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 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.60 src/sys/external/bsd/drm2/drm/files.drmkms:1.61 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.60 Sun Dec 19 10:46:02 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 10:46:24 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.60 2021/12/19 10:46:02 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.61 2021/12/19 10:46:24 riastradh Exp $ version 20180827 @@ -137,6 +137,7 @@ file external/bsd/drm2/dist/drm/drm_mode file external/bsd/drm2/dist/drm/drm_modeset_helper.c drmkms file external/bsd/drm2/dist/drm/drm_modeset_lock.c drmkms file external/bsd/drm2/dist/drm/drm_panel.c drmkms +file external/bsd/drm2/dist/drm/drm_panel_orientation_quirks.c drmkms #file external/bsd/drm2/dist/drm/drm_pci.c drmkms # drmkms_pci file external/bsd/drm2/dist/drm/drm_plane.c drmkms file external/bsd/drm2/dist/drm/drm_plane_helper.c drmkms
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:46:24 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Regen and remerge. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 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 10:46:17 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm2netbsd
Log Message:
One more file by hand.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/sys/external/bsd/drm2/drm/drm2netbsd:1.5
--- src/sys/external/bsd/drm2/drm/drm2netbsd:1.4 Sun Dec 19 10:39:49 2021
+++ src/sys/external/bsd/drm2/drm/drm2netbsd Sun Dec 19 10:46:17 2021
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: drm2netbsd,v 1.4 2021/12/19 10:39:49 riastradh Exp $
+# $NetBSD: drm2netbsd,v 1.5 2021/12/19 10:46:17 riastradh Exp $
#
# $ /path/to/drm2netbsd > /path/to/files.drm.new
#
@@ -23,8 +23,11 @@ env CONFIG_DRM_VM=y \
make -f Makefile -V '$(drm-y)' -V '$(drm_kms_helper-y)' \
| tr ' ' '\n' \
| grep -v '^$' \
-| sed -e 's,\.o$,.c,' \
-| sort -u \
+| {
+ sed -e 's,\.o$,.c,'
+ # Separate objects.
+ echo drm_panel_orientation_quirks.c
+} | sort -u \
| while read f; do
printf 'file\t%s\t%s\n' "$drmkms_top/$f" "$drmkms_flag"
done
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:46:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm2netbsd Log Message: One more file by hand. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 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 10:46:09 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_lease.c
Log Message:
drm_lease_destroy stub
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_lease.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_lease.c
diff -u src/sys/external/bsd/drm2/drm/drm_lease.c:1.3 src/sys/external/bsd/drm2/drm/drm_lease.c:1.4
--- src/sys/external/bsd/drm2/drm/drm_lease.c:1.3 Sun Dec 19 01:08:07 2021
+++ src/sys/external/bsd/drm2/drm/drm_lease.c Sun Dec 19 10:46:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_lease.c,v 1.3 2021/12/19 01:08:07 riastradh Exp $ */
+/* $NetBSD: drm_lease.c,v 1.4 2021/12/19 10:46:09 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_lease.c,v 1.3 2021/12/19 01:08:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_lease.c,v 1.4 2021/12/19 10:46:09 riastradh Exp $");
#include
#include
@@ -178,3 +178,13 @@ drm_mode_revoke_lease_ioctl(struct drm_d
/* XXX not yet implemented */
return -ENODEV;
}
+
+/*
+ * drm_lease_destroy(master)
+ *
+ * Notify lessees that master is being destroyed.
+ */
+void
+drm_lease_destroy(struct drm_master *master)
+{
+}
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:46:09 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_lease.c Log Message: drm_lease_destroy stub To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_lease.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 10:39:57 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Rerun drm2netbsd and merge. New tag drmums for the legacy stuff; to deal with later for via. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 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.57 src/sys/external/bsd/drm2/drm/files.drmkms:1.58 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.57 Sun Dec 19 10:32:47 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 10:39:57 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.57 2021/12/19 10:32:47 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.58 2021/12/19 10:39:57 riastradh Exp $ version 20180827 @@ -55,19 +55,10 @@ makeoptions drmkms "CWARNFLAGS.drmkms"+= # NetBSD additions. file external/bsd/drm2/drm/drm_agp_hook.c drmkms file external/bsd/drm2/drm/drm_cdevsw.c drmkms -file external/bsd/drm2/drm/drm_gem_cma_helper.c drmkms file external/bsd/drm2/drm/drm_gem_vm.c drmkms file external/bsd/drm2/drm/drm_module.c drmkms +file external/bsd/drm2/drm/drm_stub.c !drmkms & !drmbase file external/bsd/drm2/drm/drm_sysctl.c drmkms -file external/bsd/drm2/drm/drm_cache.c drmkms -file external/bsd/drm2/drm/drm_file.c drmkms -file external/bsd/drm2/drm/drm_gem_framebuffer_helper.c drmkms -file external/bsd/drm2/drm/drm_scatter.c drmkms -file external/bsd/drm2/drm/drm_stub.c !drmkms & !drmbase -file external/bsd/drm2/drm/drm_sysfs.c drmkms -file external/bsd/drm2/drm/drm_vm.c drmkms -file external/bsd/drm2/drm/drm_vma_manager.c drmkms -file external/bsd/drm2/i2c/drm_encoder_slave.c drmkms # Generic, unaccelerated kms framebuffer. define drmfb: genfb @@ -87,6 +78,16 @@ makeoptions drmkms "CWARNFLAGS.drm_edi makeoptions drmkms "CWARNFLAGS.drm_ioctl.c"+="-Wno-shadow" makeoptions drmkms "CWARNFLAGS.drm_modes.c"+="-Wno-shadow" +# Legacy user-mode setting +define drmums: drmkms +makeoptions drmums CPPFLAGS+="-DCONFIG_DRM_LEGACY" +file external/bsd/drm2/dist/drm/drm_bufs.c drmums +file external/bsd/drm2/dist/drm/drm_context.c drmums +file external/bsd/drm2/dist/drm/drm_dma.c drmums +file external/bsd/drm2/dist/drm/drm_legacy_misc.c drmums +file external/bsd/drm2/dist/drm/drm_lock.c drmums +file external/bsd/drm2/drm/drm_scatter.c drmums + # Generated from drm2netbsd. #file external/bsd/drm2/dist/drm/drm_agpsupport.c drmkms # drmkms_pci file external/bsd/drm2/dist/drm/drm_atomic.c drmkms @@ -96,7 +97,7 @@ file external/bsd/drm2/dist/drm/drm_atom file external/bsd/drm2/dist/drm/drm_auth.c drmkms file external/bsd/drm2/dist/drm/drm_blend.c drmkms file external/bsd/drm2/dist/drm/drm_bridge.c drmkms -#file external/bsd/drm2/dist/drm/drm_cache.c drmkms +file external/bsd/drm2/drm/drm_cache.c drmkms #file external/bsd/drm2/dist/drm/drm_client.c drmkms file external/bsd/drm2/dist/drm/drm_client_modeset.c drmkms file external/bsd/drm2/dist/drm/drm_color_mgmt.c drmkms @@ -112,15 +113,16 @@ file external/bsd/drm2/dist/drm/drm_dsc. file external/bsd/drm2/dist/drm/drm_dumb_buffers.c drmkms file external/bsd/drm2/dist/drm/drm_edid.c drmkms file external/bsd/drm2/dist/drm/drm_encoder.c drmkms -#file external/bsd/drm2/dist/drm/drm_encoder_slave.c drmkms +file external/bsd/drm2/i2c/drm_encoder_slave.c drmkms file external/bsd/drm2/dist/drm/drm_fb_helper.c drmkms -#file external/bsd/drm2/dist/drm/drm_file.c drmkms +file external/bsd/drm2/drm/drm_file.c drmkms file external/bsd/drm2/dist/drm/drm_flip_work.c drmkms #file external/bsd/drm2/dist/drm/drm_format_helper.c drmkms 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/drm/drm_gem_cma_helper.c drmkms +file external/bsd/drm2/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 @@ -134,6 +136,7 @@ file external/bsd/drm2/dist/drm/drm_mode file external/bsd/drm2/dist/drm/drm_modes.c drmkms file external/bsd/drm2/dist/drm/drm_modeset_helper.c drmkms file external/bsd/drm2/dist/drm/drm_modeset_lock.c drmkms +file external/bsd/drm2/dist/drm/drm_panel.c drmkms #file external/bsd/drm2/dist/drm/drm_pci.c drmkms # drmkms_pci file external/bsd/drm2/dist/drm/drm_plane.c drmkms file external/bsd/drm2/dist/drm/drm_plane_helper.c drmkms @@ -146,9 +149,9 @@ 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_simple_kms_helper.c drmkms file
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:39:57 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Rerun drm2netbsd and merge. New tag drmums for the legacy stuff; to deal with later for via. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 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 10:39:49 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm2netbsd Log Message: Add a couple more make variables. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 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.3 src/sys/external/bsd/drm2/drm/drm2netbsd:1.4 --- src/sys/external/bsd/drm2/drm/drm2netbsd:1.3 Sun Dec 19 00:25:13 2021 +++ src/sys/external/bsd/drm2/drm/drm2netbsd Sun Dec 19 10:39:49 2021 @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: drm2netbsd,v 1.3 2021/12/19 00:25:13 riastradh Exp $ +# $NetBSD: drm2netbsd,v 1.4 2021/12/19 10:39:49 riastradh Exp $ # # $ /path/to/drm2netbsd > /path/to/files.drm.new # @@ -17,6 +17,8 @@ drmkms_flag=drmkms env CONFIG_PCI=y \ env CONFIG_AGP=y \ env CONFIG_DRM_FBDEV_EMULATION=y \ +env CONFIG_DRM_GEM_CMA_HELPER=y \ +env CONFIG_DRM_PANEL=y \ env CONFIG_DRM_VM=y \ make -f Makefile -V '$(drm-y)' -V '$(drm_kms_helper-y)' \ | tr ' ' '\n' \
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:39:49 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm2netbsd Log Message: Add a couple more make variables. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 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 10:39:42 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_sysfs.c
Log Message:
Restore drm_sysfs_connector_add/remove stubs.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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_sysfs.c
diff -u src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.7 src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.8
--- src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.7 Sun Dec 19 10:35:52 2021
+++ src/sys/external/bsd/drm2/drm/drm_sysfs.c Sun Dec 19 10:39:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_sysfs.c,v 1.7 2021/12/19 10:35:52 riastradh Exp $ */
+/* $NetBSD: drm_sysfs.c,v 1.8 2021/12/19 10:39:42 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,10 +30,23 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,v 1.7 2021/12/19 10:35:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,v 1.8 2021/12/19 10:39:42 riastradh Exp $");
#include
+#include "../dist/drm/drm_internal.h"
+
+int
+drm_sysfs_connector_add(struct drm_connector *connector)
+{
+ return 0;
+}
+
+void
+drm_sysfs_connector_remove(struct drm_connector *connector)
+{
+}
+
void
drm_sysfs_hotplug_event(struct drm_device *dev)
{
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:39:42 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_sysfs.c Log Message: Restore drm_sysfs_connector_add/remove stubs. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 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 10:36:21 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_module.c Log Message: drm_global_init/release is no more To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/drm/drm_module.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_module.c diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.24 src/sys/external/bsd/drm2/drm/drm_module.c:1.25 --- src/sys/external/bsd/drm2/drm/drm_module.c:1.24 Sun Dec 19 10:32:59 2021 +++ src/sys/external/bsd/drm2/drm/drm_module.c Sun Dec 19 10:36:21 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_module.c,v 1.24 2021/12/19 10:32:59 riastradh Exp $ */ +/* $NetBSD: drm_module.c,v 1.25 2021/12/19 10:36:21 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.24 2021/12/19 10:32:59 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.25 2021/12/19 10:36:21 riastradh Exp $"); #include #include @@ -129,7 +129,6 @@ drm_init(void) linux_mutex_init(_global_mutex); linux_mutex_init(_kernel_fb_helper_lock); drm_connector_ida_init(); - drm_global_init(); drm_panel_init_lock(); drm_bridge_init_lock(); drm_sysctl_init(_def); @@ -158,7 +157,6 @@ drm_fini(void) drm_sysctl_fini(_def); drm_bridge_fini_lock(); drm_panel_fini_lock(); - drm_global_release(); drm_connector_ida_destroy(); linux_mutex_destroy(_kernel_fb_helper_lock); linux_mutex_destroy(_global_mutex);
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:36:21 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_module.c Log Message: drm_global_init/release is no more To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/drm/drm_module.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 10:36:13 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_memory.c Log Message: for DRM_DEBUG To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/drm/drm_memory.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_memory.c diff -u src/sys/external/bsd/drm2/drm/drm_memory.c:1.15 src/sys/external/bsd/drm2/drm/drm_memory.c:1.16 --- src/sys/external/bsd/drm2/drm/drm_memory.c:1.15 Sun Dec 19 10:32:59 2021 +++ src/sys/external/bsd/drm2/drm/drm_memory.c Sun Dec 19 10:36:13 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_memory.c,v 1.15 2021/12/19 10:32:59 riastradh Exp $ */ +/* $NetBSD: drm_memory.c,v 1.16 2021/12/19 10:36:13 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.15 2021/12/19 10:32:59 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.16 2021/12/19 10:36:13 riastradh Exp $"); #if defined(__i386__) || defined(__x86_64__) @@ -75,6 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_memory.c #include #include #include +#include /* * XXX drm_bus_borrow is a horrible kludge!
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:36:13 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_memory.c Log Message: for DRM_DEBUG To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/drm/drm_memory.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 10:36:00 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_cdevsw.c Log Message: drm_agpsupport.h for drm_legacy_agp_clear. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/drm/drm_cdevsw.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_cdevsw.c diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.24 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.25 --- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.24 Sun Dec 19 10:32:59 2021 +++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Dec 19 10:35:59 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_cdevsw.c,v 1.24 2021/12/19 10:32:59 riastradh Exp $ */ +/* $NetBSD: drm_cdevsw.c,v 1.25 2021/12/19 10:35:59 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.24 2021/12/19 10:32:59 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.25 2021/12/19 10:35:59 riastradh Exp $"); #include #include @@ -57,6 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c #include +#include #include #include #include
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:36:00 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_cdevsw.c Log Message: drm_agpsupport.h for drm_legacy_agp_clear. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/drm/drm_cdevsw.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 10:21:18 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Disable missing files for now. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 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.55 src/sys/external/bsd/drm2/drm/files.drmkms:1.56 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.55 Sun Dec 19 10:21:09 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 10:21:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.55 2021/12/19 10:21:09 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.56 2021/12/19 10:21:18 riastradh Exp $ version 20180827 @@ -85,7 +85,7 @@ file external/bsd/drm2/dist/drm/drm_auth file external/bsd/drm2/dist/drm/drm_blend.c drmkms file external/bsd/drm2/dist/drm/drm_bridge.c drmkms #file external/bsd/drm2/dist/drm/drm_cache.c drmkms -file external/bsd/drm2/dist/drm/drm_client.c drmkms +#file external/bsd/drm2/dist/drm/drm_client.c drmkms file external/bsd/drm2/dist/drm/drm_client_modeset.c drmkms file external/bsd/drm2/dist/drm/drm_color_mgmt.c drmkms file external/bsd/drm2/dist/drm/drm_connector.c drmkms @@ -104,13 +104,13 @@ file external/bsd/drm2/dist/drm/drm_enco file external/bsd/drm2/dist/drm/drm_fb_helper.c drmkms #file external/bsd/drm2/dist/drm/drm_file.c drmkms file external/bsd/drm2/dist/drm/drm_flip_work.c drmkms -file external/bsd/drm2/dist/drm/drm_format_helper.c drmkms +#file external/bsd/drm2/dist/drm/drm_format_helper.c drmkms 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_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_hdcp.c drmkms 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 @@ -132,7 +132,7 @@ file external/bsd/drm2/dist/drm/drm_prop file external/bsd/drm2/dist/drm/drm_rect.c drmkms file external/bsd/drm2/dist/drm/drm_scdc_helper.c drmkms file external/bsd/drm2/dist/drm/drm_self_refresh_helper.c drmkms -file external/bsd/drm2/dist/drm/drm_simple_kms_helper.c drmkms +#file external/bsd/drm2/dist/drm/drm_simple_kms_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
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:21:18 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Disable missing files for now. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 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 10:21:09 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Merge updated drm2netbsd output. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 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.54 src/sys/external/bsd/drm2/drm/files.drmkms:1.55 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.54 Sun Dec 19 09:53:14 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 10:21:09 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.54 2021/12/19 09:53:14 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.55 2021/12/19 10:21:09 riastradh Exp $ version 20180827 @@ -75,6 +75,7 @@ makeoptions drmkms "CWARNFLAGS.drm_edi makeoptions drmkms "CWARNFLAGS.drm_ioctl.c"+="-Wno-shadow" makeoptions drmkms "CWARNFLAGS.drm_modes.c"+="-Wno-shadow" +# Generated from drm2netbsd. #file external/bsd/drm2/dist/drm/drm_agpsupport.c drmkms # drmkms_pci file external/bsd/drm2/dist/drm/drm_atomic.c drmkms file external/bsd/drm2/dist/drm/drm_atomic_helper.c drmkms @@ -84,6 +85,7 @@ file external/bsd/drm2/dist/drm/drm_auth file external/bsd/drm2/dist/drm/drm_blend.c drmkms file external/bsd/drm2/dist/drm/drm_bridge.c drmkms #file external/bsd/drm2/dist/drm/drm_cache.c drmkms +file external/bsd/drm2/dist/drm/drm_client.c drmkms file external/bsd/drm2/dist/drm/drm_client_modeset.c drmkms file external/bsd/drm2/dist/drm/drm_color_mgmt.c drmkms file external/bsd/drm2/dist/drm/drm_connector.c drmkms @@ -102,15 +104,17 @@ file external/bsd/drm2/dist/drm/drm_enco file external/bsd/drm2/dist/drm/drm_fb_helper.c drmkms #file external/bsd/drm2/dist/drm/drm_file.c drmkms file external/bsd/drm2/dist/drm/drm_flip_work.c drmkms +file external/bsd/drm2/dist/drm/drm_format_helper.c drmkms 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 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/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 @@ -128,8 +132,11 @@ file external/bsd/drm2/dist/drm/drm_prop file external/bsd/drm2/dist/drm/drm_rect.c drmkms file external/bsd/drm2/dist/drm/drm_scdc_helper.c drmkms file external/bsd/drm2/dist/drm/drm_self_refresh_helper.c drmkms +file external/bsd/drm2/dist/drm/drm_simple_kms_helper.c drmkms file external/bsd/drm2/dist/drm/drm_syncobj.c drmkms -#file external/bsd/drm2/dist/drm/drm_trace_points.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_vblank.c drmkms -#file external/bsd/drm2/dist/drm/drm_vma_manager.c drmkms #file external/bsd/drm2/dist/drm/drm_vm.c drmkms +#file external/bsd/drm2/dist/drm/drm_vma_manager.c drmkms +#file external/bsd/drm2/dist/drm/drm_writeback.c drmkms
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:21:09 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Merge updated drm2netbsd output. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 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 09:53:14 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Remove these two files from the list. We have our own copies of the same name. Since we don't support building two files with the same name, it's pretty clear the intention was to build just our copy of the file. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 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.53 src/sys/external/bsd/drm2/drm/files.drmkms:1.54 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.53 Sun Dec 19 09:50:50 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 09:53:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.53 2021/12/19 09:50:50 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.54 2021/12/19 09:53:14 riastradh Exp $ version 20180827 @@ -131,5 +131,5 @@ file external/bsd/drm2/dist/drm/drm_self file external/bsd/drm2/dist/drm/drm_syncobj.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 +#file external/bsd/drm2/dist/drm/drm_vma_manager.c drmkms +#file external/bsd/drm2/dist/drm/drm_vm.c drmkms
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:53:14 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Remove these two files from the list. We have our own copies of the same name. Since we don't support building two files with the same name, it's pretty clear the intention was to build just our copy of the file. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 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 09:53:06 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drmfb.c
Log Message:
Iterate over connectors differently (i.e. in a way that compiles)
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/drm/drmfb.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/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.8 src/sys/external/bsd/drm2/drm/drmfb.c:1.9
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.8 Sat Jun 27 13:41:44 2020
+++ src/sys/external/bsd/drm2/drm/drmfb.c Sun Dec 19 09:53:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb.c,v 1.8 2020/06/27 13:41:44 jmcneill Exp $ */
+/* $NetBSD: drmfb.c,v 1.9 2021/12/19 09:53:06 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.8 2020/06/27 13:41:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.9 2021/12/19 09:53:06 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -84,6 +84,8 @@ int
drmfb_attach(struct drmfb_softc *sc, const struct drmfb_attach_args *da)
{
const struct drm_fb_helper_surface_size *const sizes = da->da_fb_sizes;
+ struct drm_connector_list_iter conn_iter;
+ struct drm_connector *connector;
const prop_dictionary_t dict = device_properties(da->da_dev);
#if NVGA > 0
struct drm_device *const dev = da->da_fb_helper->dev;
@@ -92,7 +94,7 @@ drmfb_attach(struct drmfb_softc *sc, con
struct genfb_ops genfb_ops = zero_genfb_ops;
enum { CONS_VGA, CONS_GENFB, CONS_NONE } what_was_cons;
bool is_console;
- int error, n;
+ int error;
/* genfb requires this. */
KASSERTMSG((void *)>sc_genfb == device_private(da->da_dev),
@@ -136,9 +138,8 @@ drmfb_attach(struct drmfb_softc *sc, con
}
/* Make the first EDID we find available to wsfb */
- for (n = 0; n < da->da_fb_helper->connector_count; n++) {
- struct drm_connector *connector =
- da->da_fb_helper->connector_info[n]->connector;
+ drm_connector_list_iter_begin(da->da_fb_helper->dev, _iter);
+ drm_client_for_each_connector_iter(connector, _iter) {
struct drm_property_blob *edid = connector->edid_blob_ptr;
if (edid && edid->length) {
prop_dictionary_set_data(dict, "EDID", edid->data,
@@ -146,6 +147,7 @@ drmfb_attach(struct drmfb_softc *sc, con
break;
}
}
+ drm_connector_list_iter_end(_iter);
sc->sc_genfb.sc_dev = sc->sc_da.da_dev;
genfb_init(>sc_genfb);
@@ -194,6 +196,8 @@ drmfb_genfb_ioctl(void *v, void *vs, uns
struct genfb_softc *const genfb = v;
struct drmfb_softc *const sc = container_of(genfb, struct drmfb_softc,
sc_genfb);
+ struct drm_connector_list_iter conn_iter;
+ struct drm_connector *connector;
int error;
if (sc->sc_da.da_params->dp_ioctl) {
@@ -224,16 +228,15 @@ drmfb_genfb_ioctl(void *v, void *vs, uns
const int dpms_mode = on? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF;
struct drm_fb_helper *const fb_helper = sc->sc_da.da_fb_helper;
struct drm_device *const dev = fb_helper->dev;
- unsigned i;
drm_modeset_lock_all(dev);
- for (i = 0; i < fb_helper->connector_count; i++) {
- struct drm_connector *const connector =
- fb_helper->connector_info[i]->connector;
+ drm_connector_list_iter_begin(fb_helper->dev, _iter);
+ drm_client_for_each_connector_iter(connector, _iter) {
(*connector->funcs->dpms)(connector, dpms_mode);
drm_object_property_set_value(>base,
dev->mode_config.dpms_property, dpms_mode);
}
+ drm_connector_list_iter_end(_iter);
drm_modeset_unlock_all(dev);
return 0;
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:53:06 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drmfb.c Log Message: Iterate over connectors differently (i.e. in a way that compiles) Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/drm/drmfb.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 09:52:59 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_sysfs.c drm_vm.c Log Message: Use drmP.h less in our local files. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/drm/drm_sysfs.c cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/drm/drm_vm.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_sysfs.c diff -u src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.5 src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.6 --- src/sys/external/bsd/drm2/drm/drm_sysfs.c:1.5 Sun Dec 19 00:28:20 2021 +++ src/sys/external/bsd/drm2/drm/drm_sysfs.c Sun Dec 19 09:52:59 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_sysfs.c,v 1.5 2021/12/19 00:28:20 riastradh Exp $ */ +/* $NetBSD: drm_sysfs.c,v 1.6 2021/12/19 09:52:59 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,9 +30,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,v 1.5 2021/12/19 00:28:20 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,v 1.6 2021/12/19 09:52:59 riastradh Exp $"); -#include +#include #include "../dist/drm/drm_internal.h" Index: src/sys/external/bsd/drm2/drm/drm_vm.c diff -u src/sys/external/bsd/drm2/drm/drm_vm.c:1.11 src/sys/external/bsd/drm2/drm/drm_vm.c:1.12 --- src/sys/external/bsd/drm2/drm/drm_vm.c:1.11 Fri Feb 14 04:36:56 2020 +++ src/sys/external/bsd/drm2/drm/drm_vm.c Sun Dec 19 09:52:59 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_vm.c,v 1.11 2020/02/14 04:36:56 riastradh Exp $ */ +/* $NetBSD: drm_vm.c,v 1.12 2021/12/19 09:52:59 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_vm.c,v 1.11 2020/02/14 04:36:56 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_vm.c,v 1.12 2021/12/19 09:52:59 riastradh Exp $"); #include #include @@ -39,7 +39,10 @@ __KERNEL_RCSID(0, "$NetBSD: drm_vm.c,v 1 #include #include -#include +#include + +#include +#include #include static paddr_t drm_legacy_mmap_paddr_locked(struct drm_device *, off_t, int);
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:52:59 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_sysfs.c drm_vm.c Log Message: Use drmP.h less in our local files. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/drm/drm_sysfs.c cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/drm/drm_vm.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 09:50:50 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: upstream shadows, disable warning Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 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.52 src/sys/external/bsd/drm2/drm/files.drmkms:1.53 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.52 Sun Dec 19 09:46:55 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 09:50:50 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.52 2021/12/19 09:46:55 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.53 2021/12/19 09:50:50 riastradh Exp $ version 20180827 @@ -73,6 +73,7 @@ makeoptions drmkms "CWARNFLAGS.drm_dp_ makeoptions drmkms "CWARNFLAGS.drm_fb_helper.c"+="-Wno-shadow" makeoptions drmkms "CWARNFLAGS.drm_edid.c"+="-Wno-shadow" makeoptions drmkms "CWARNFLAGS.drm_ioctl.c"+="-Wno-shadow" +makeoptions drmkms "CWARNFLAGS.drm_modes.c"+="-Wno-shadow" #file external/bsd/drm2/dist/drm/drm_agpsupport.c drmkms # drmkms_pci file external/bsd/drm2/dist/drm/drm_atomic.c drmkms
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:50:50 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: upstream shadows, disable warning Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 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 09:50:42 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_module.c drm_scatter.c Log Message: Missing includes, conditionalize on drm legacy Might want to remove drm legacy code entirely later. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/drm/drm_module.c cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_scatter.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_module.c diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.21 src/sys/external/bsd/drm2/drm/drm_module.c:1.22 --- src/sys/external/bsd/drm2/drm/drm_module.c:1.21 Sun Dec 19 01:03:22 2021 +++ src/sys/external/bsd/drm2/drm/drm_module.c Sun Dec 19 09:50:42 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_module.c,v 1.21 2021/12/19 01:03:22 riastradh Exp $ */ +/* $NetBSD: drm_module.c,v 1.22 2021/12/19 09:50:42 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.21 2021/12/19 01:03:22 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.22 2021/12/19 09:50:42 riastradh Exp $"); #include #include @@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_module.c #include #include +#include #include #include #include Index: src/sys/external/bsd/drm2/drm/drm_scatter.c diff -u src/sys/external/bsd/drm2/drm/drm_scatter.c:1.6 src/sys/external/bsd/drm2/drm/drm_scatter.c:1.7 --- src/sys/external/bsd/drm2/drm/drm_scatter.c:1.6 Sun Dec 19 00:28:20 2021 +++ src/sys/external/bsd/drm2/drm/drm_scatter.c Sun Dec 19 09:50:42 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_scatter.c,v 1.6 2021/12/19 00:28:20 riastradh Exp $ */ +/* $NetBSD: drm_scatter.c,v 1.7 2021/12/19 09:50:42 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.6 2021/12/19 00:28:20 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.7 2021/12/19 09:50:42 riastradh Exp $"); #include #include @@ -40,10 +40,12 @@ __KERNEL_RCSID(0, "$NetBSD: drm_scatter. #include #include +#include #include "../dist/drm/drm_internal.h" #include "../dist/drm/drm_legacy.h" +#if IS_ENABLED(CONFIG_DRM_LEGACY) static int drm_sg_alloc_mem(struct drm_device *, size_t, struct drm_sg_mem **); static void drm_sg_free_mem(struct drm_device *, struct drm_sg_mem *); @@ -238,3 +240,4 @@ drm_sg_free_mem(struct drm_device *dev, sg->sg_tag = NULL; /* XXX paranoia */ kmem_free(sg, offsetof(struct drm_sg_mem, sg_segs[sg->sg_nsegs_max])); } +#endif
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:50:42 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_module.c drm_scatter.c Log Message: Missing includes, conditionalize on drm legacy Might want to remove drm legacy code entirely later. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/drm/drm_module.c cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_scatter.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 09:49:31 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_gem_vm.c Log Message: drm/drm_drv.h for struct drm_device Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/drm/drm_gem_vm.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_gem_vm.c diff -u src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.12 src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.13 --- src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.12 Sun Dec 19 09:49:08 2021 +++ src/sys/external/bsd/drm2/drm/drm_gem_vm.c Sun Dec 19 09:49:31 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_gem_vm.c,v 1.12 2021/12/19 09:49:08 riastradh Exp $ */ +/* $NetBSD: drm_gem_vm.c,v 1.13 2021/12/19 09:49:31 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_gem_vm.c,v 1.12 2021/12/19 09:49:08 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_gem_vm.c,v 1.13 2021/12/19 09:49:31 riastradh Exp $"); #include #include @@ -38,6 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_gem_vm.c #include #include +#include #include #include #include
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:49:31 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_gem_vm.c Log Message: drm/drm_drv.h for struct drm_device Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/drm/drm_gem_vm.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 09:49:24 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_lock.c
Log Message:
Make our code follow CONFIG_DRM_LEGACY.
We might want to delete all this code later, but no rush.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/drm/drm_lock.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_lock.c
diff -u src/sys/external/bsd/drm2/drm/drm_lock.c:1.10 src/sys/external/bsd/drm2/drm/drm_lock.c:1.11
--- src/sys/external/bsd/drm2/drm/drm_lock.c:1.10 Sun Dec 19 00:57:29 2021
+++ src/sys/external/bsd/drm2/drm/drm_lock.c Sun Dec 19 09:49:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_lock.c,v 1.10 2021/12/19 00:57:29 riastradh Exp $ */
+/* $NetBSD: drm_lock.c,v 1.11 2021/12/19 09:49:24 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.10 2021/12/19 00:57:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.11 2021/12/19 09:49:24 riastradh Exp $");
#include
#include
@@ -60,6 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v
static bool drm_lock_acquire(struct drm_lock_data *, int);
static void drm_lock_release(struct drm_lock_data *, int);
+
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
static int drm_lock_block_signals(struct drm_device *, struct drm_lock *,
struct drm_file *);
static void drm_lock_unblock_signals(struct drm_device *,
@@ -215,6 +217,7 @@ out1: spin_unlock(>lock.spinlock
out0: mutex_lock(_global_mutex);
return error;
}
+#endif
/*
* Try to acquire the lock. Whether or not we acquire it, guarantee
@@ -260,6 +263,7 @@ drm_legacy_idlelock_release(struct drm_l
spin_unlock(_data->spinlock);
}
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
/*
* Release the lock and free it on closing of a drm file.
*/
@@ -296,6 +300,7 @@ drm_legacy_lock_release(struct drm_devic
out: spin_unlock(_data->spinlock);
}
+#endif
/*
* Try to acquire the lock. Return true if successful, false if not.
@@ -353,6 +358,7 @@ drm_lock_release(struct drm_lock_data *l
DRM_SPIN_WAKEUP_ONE(_data->lock_queue, _data->spinlock);
}
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
/*
* Block signals for a process that holds a drm lock.
*
@@ -375,3 +381,4 @@ drm_lock_unblock_signals(struct drm_devi
struct drm_lock *lock_request __unused, struct drm_file *file __unused)
{
}
+#endif
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:49:24 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_lock.c Log Message: Make our code follow CONFIG_DRM_LEGACY. We might want to delete all this code later, but no rush. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/drm/drm_lock.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 09:49:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_gem_framebuffer_helper.c Log Message: drm/drm_print.h for struct drm_printer drm/drm_fourcc.h for struct drm_format_info Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_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/drm/drm_gem_framebuffer_helper.c diff -u src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_helper.c:1.2 src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_helper.c:1.3 --- src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_helper.c:1.2 Sun Dec 19 00:59:34 2021 +++ src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_helper.c Sun Dec 19 09:49:17 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_gem_framebuffer_helper.c,v 1.2 2021/12/19 00:59:34 riastradh Exp $ */ +/* $NetBSD: drm_gem_framebuffer_helper.c,v 1.3 2021/12/19 09:49:17 riastradh Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,11 +30,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_gem_framebuffer_helper.c,v 1.2 2021/12/19 00:59:34 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_gem_framebuffer_helper.c,v 1.3 2021/12/19 09:49:17 riastradh Exp $"); #include #include +#include +#include #include #include #include
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:49:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_gem_framebuffer_helper.c Log Message: drm/drm_print.h for struct drm_printer drm/drm_fourcc.h for struct drm_format_info Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/drm/drm_gem_framebuffer_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/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 09:49:09 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_gem_cma_helper.c drm_gem_vm.c
Log Message:
Catch up with function renames
reference -> get, unreference -> put
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c \
src/sys/external/bsd/drm2/drm/drm_gem_vm.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_gem_cma_helper.c
diff -u src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.11 src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.12
--- src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.11 Sun Dec 19 00:55:18 2021
+++ src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c Sun Dec 19 09:49:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem_cma_helper.c,v 1.11 2021/12/19 00:55:18 riastradh Exp $ */
+/* $NetBSD: drm_gem_cma_helper.c,v 1.12 2021/12/19 09:49:08 riastradh Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_helper.c,v 1.11 2021/12/19 00:55:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_helper.c,v 1.12 2021/12/19 09:49:08 riastradh Exp $");
#include
#include
@@ -160,7 +160,7 @@ drm_gem_cma_dumb_create(struct drm_file
return -ENOMEM;
error = drm_gem_handle_create(file_priv, >base, );
- drm_gem_object_unreference_unlocked(>base);
+ drm_gem_object_put_unlocked(>base);
if (error) {
drm_gem_cma_obj_free(obj);
return error;
Index: src/sys/external/bsd/drm2/drm/drm_gem_vm.c
diff -u src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.11 src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.12
--- src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.11 Sun Dec 19 01:13:28 2021
+++ src/sys/external/bsd/drm2/drm/drm_gem_vm.c Sun Dec 19 09:49:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem_vm.c,v 1.11 2021/12/19 01:13:28 riastradh Exp $ */
+/* $NetBSD: drm_gem_vm.c,v 1.12 2021/12/19 09:49:08 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_gem_vm.c,v 1.11 2021/12/19 01:13:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem_vm.c,v 1.12 2021/12/19 09:49:08 riastradh Exp $");
#include
#include
@@ -51,7 +51,7 @@ drm_gem_pager_reference(struct uvm_objec
struct drm_gem_object *const obj = container_of(uobj,
struct drm_gem_object, gemo_uvmobj);
- drm_gem_object_reference(obj);
+ drm_gem_object_get(obj);
}
void
@@ -60,7 +60,7 @@ drm_gem_pager_detach(struct uvm_object *
struct drm_gem_object *const obj = container_of(uobj,
struct drm_gem_object, gemo_uvmobj);
- drm_gem_object_unreference_unlocked(obj);
+ drm_gem_object_put_unlocked(obj);
}
int
@@ -130,7 +130,7 @@ drm_gem_mmap_object_locked(struct drm_de
KASSERT(obj->dev == dev);
/* Success! */
- drm_gem_object_reference(obj);
+ drm_gem_object_get(obj);
*uobjp = >gemo_uvmobj;
*uoffsetp = 0;
return 0;
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:49:09 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_gem_cma_helper.c drm_gem_vm.c Log Message: Catch up with function renames reference -> get, unreference -> put Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c \ src/sys/external/bsd/drm2/drm/drm_gem_vm.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 09:46:55 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: We have local versions of these files, don't use upstream ones Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 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.51 src/sys/external/bsd/drm2/drm/files.drmkms:1.52 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.51 Sun Dec 19 09:46:48 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 09:46:55 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.51 2021/12/19 09:46:48 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.52 2021/12/19 09:46:55 riastradh Exp $ version 20180827 @@ -97,9 +97,9 @@ file external/bsd/drm2/dist/drm/drm_dsc. file external/bsd/drm2/dist/drm/drm_dumb_buffers.c drmkms file external/bsd/drm2/dist/drm/drm_edid.c drmkms file external/bsd/drm2/dist/drm/drm_encoder.c drmkms -file external/bsd/drm2/dist/drm/drm_encoder_slave.c drmkms +#file external/bsd/drm2/dist/drm/drm_encoder_slave.c drmkms file external/bsd/drm2/dist/drm/drm_fb_helper.c drmkms -file external/bsd/drm2/dist/drm/drm_file.c drmkms +#file external/bsd/drm2/dist/drm/drm_file.c drmkms file external/bsd/drm2/dist/drm/drm_flip_work.c drmkms file external/bsd/drm2/dist/drm/drm_fourcc.c drmkms file external/bsd/drm2/dist/drm/drm_framebuffer.c drmkms
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:46:55 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: We have local versions of these files, don't use upstream ones Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 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 09:46:48 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Upstream uses shadowing, disable warning Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 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.50 src/sys/external/bsd/drm2/drm/files.drmkms:1.51 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.50 Sun Dec 19 01:59:48 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 09:46:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.50 2021/12/19 01:59:48 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.51 2021/12/19 09:46:48 riastradh Exp $ version 20180827 @@ -70,6 +70,7 @@ makeoptions drmkms "CWARNFLAGS.drm_crt makeoptions drmkms "CWARNFLAGS.drm_crtc.c"+="-Wno-shadow" makeoptions drmkms "CWARNFLAGS.drm_client_modeset.c"+="-Wno-shadow" makeoptions drmkms "CWARNFLAGS.drm_dp_helper.c"+="-Wno-pointer-arith" +makeoptions drmkms "CWARNFLAGS.drm_fb_helper.c"+="-Wno-shadow" makeoptions drmkms "CWARNFLAGS.drm_edid.c"+="-Wno-shadow" makeoptions drmkms "CWARNFLAGS.drm_ioctl.c"+="-Wno-shadow"
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 09:46:48 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Upstream uses shadowing, disable warning Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 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.
