CVS commit: xsrc/external/mit/xf86-video-suncg14/dist/src
Module Name:xsrc
Committed By: macallan
Date: Sun Dec 19 04:50:27 UTC 2021
Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_accel.c
Log Message:
always drain the pipeline before writing SX_ROP_CONTROL
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.25 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.26
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.25 Fri Dec 10 21:57:13 2021
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c Sun Dec 19 04:50:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cg14_accel.c,v 1.25 2021/12/10 21:57:13 macallan Exp $ */
+/* $NetBSD: cg14_accel.c,v 1.26 2021/12/19 04:50:27 macallan Exp $ */
/*
* Copyright (c) 2013 Michael Lorenz
* All rights reserved.
@@ -450,6 +450,7 @@ CG14Copy8_short_rop(Cg14Ptr p, int srcst
/* mask out the leading pixels in dst by using a mask and ROP */
if (pre != 0) {
+ CG14Wait(p);
write_sx_reg(p, SX_ROP_CONTROL, (p->last_rop & 0xf0) | 0xa);
write_sx_reg(p, SX_QUEUED(R_MASK), 0x);
}
@@ -561,6 +562,7 @@ CG14Copy8_short_norop(Cg14Ptr p, int src
/* mask out the leading pixels in dst by using a mask and ROP */
if (pre != 0) {
+ CG14Wait(p);
write_sx_reg(p, SX_ROP_CONTROL, 0xca);
write_sx_reg(p, SX_QUEUED(R_MASK), lmask);
}
CVS commit: xsrc/external/mit/xf86-video-suncg14/dist/src
Module Name:xsrc Committed By: macallan Date: Sun Dec 19 04:50:27 UTC 2021 Modified Files: xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_accel.c Log Message: always drain the pipeline before writing SX_ROP_CONTROL To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 \ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 02:00:03 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_client_modeset.c
Log Message:
nbsd-namespace.h for mutex_init etc.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/drm_client_modeset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_client_modeset.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_client_modeset.c:1.2 src/sys/external/bsd/drm2/dist/drm/drm_client_modeset.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/drm_client_modeset.c:1.2 Sat Dec 18 23:44:57 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_client_modeset.c Sun Dec 19 02:00:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_client_modeset.c,v 1.2 2021/12/18 23:44:57 riastradh Exp $ */
+/* $NetBSD: drm_client_modeset.c,v 1.3 2021/12/19 02:00:03 riastradh Exp $ */
// SPDX-License-Identifier: MIT
/*
@@ -10,7 +10,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_client_modeset.c,v 1.2 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_client_modeset.c,v 1.3 2021/12/19 02:00:03 riastradh Exp $");
#include
#include
@@ -28,6 +28,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_client_m
#include "drm_crtc_internal.h"
#include "drm_internal.h"
+#include
+
#define DRM_CLIENT_MAX_CLONED_CONNECTORS 8
struct drm_client_offset {
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 02:00:03 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_client_modeset.c Log Message: nbsd-namespace.h for mutex_init etc. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/drm_client_modeset.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/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:59:55 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: bitops.h Log Message: define BITS_PER_LONG. use compiler-defined macro instead of sizeof. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/common/include/linux/bitops.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/common/include/linux/bitops.h diff -u src/sys/external/bsd/common/include/linux/bitops.h:1.12 src/sys/external/bsd/common/include/linux/bitops.h:1.13 --- src/sys/external/bsd/common/include/linux/bitops.h:1.12 Sun Dec 19 01:54:12 2021 +++ src/sys/external/bsd/common/include/linux/bitops.h Sun Dec 19 01:59:55 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: bitops.h,v 1.12 2021/12/19 01:54:12 riastradh Exp $ */ +/* $NetBSD: bitops.h,v 1.13 2021/12/19 01:59:55 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -102,16 +102,11 @@ sign_extend64(uint64_t x, unsigned n) return (int64_t)(x << (63 - n)) >> (63 - n); } -/* - * XXX Don't define BITS_PER_LONG as sizeof(unsigned long)*CHAR_BIT - * because that won't work in preprocessor conditionals, where it often - * turns up. - */ - #define BITS_TO_LONGS(n) \ roundup2((n), (sizeof(unsigned long) * CHAR_BIT)) #define BITS_PER_BYTE NBBY +#define BITS_PER_LONG (__SIZEOF_LONG__ * CHAR_BIT) #define BIT(n) ((unsigned long)__BIT(n)) #define BIT_ULL(n) ((unsigned long long)__BIT(n))
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:59:55 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: bitops.h Log Message: define BITS_PER_LONG. use compiler-defined macro instead of sizeof. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/common/include/linux/bitops.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:59:48 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Disable warnings about shadowing. Upstream does shadowing here, I'm feeling uncomfortable changing their code. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 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.49 src/sys/external/bsd/drm2/drm/files.drmkms:1.50 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.49 Sun Dec 19 01:59:27 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 01:59:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.49 2021/12/19 01:59:27 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.50 2021/12/19 01:59:48 riastradh Exp $ version 20180827 @@ -68,6 +68,7 @@ makeoptions drmkms "CWARNFLAGS.drm_buf makeoptions drmkms "CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers" makeoptions drmkms "CWARNFLAGS.drm_crtc.c"+="-Wno-pointer-arith" 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_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 01:59:48 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: Disable warnings about shadowing. Upstream does shadowing here, I'm feeling uncomfortable changing their code. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 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/include/asm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:59:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/asm: uaccess.h Log Message: linux/compiler.h for #define __user Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/include/asm/uaccess.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/include/asm/uaccess.h diff -u src/sys/external/bsd/drm2/include/asm/uaccess.h:1.7 src/sys/external/bsd/drm2/include/asm/uaccess.h:1.8 --- src/sys/external/bsd/drm2/include/asm/uaccess.h:1.7 Sun Dec 19 01:55:14 2021 +++ src/sys/external/bsd/drm2/include/asm/uaccess.h Sun Dec 19 01:59:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: uaccess.h,v 1.7 2021/12/19 01:55:14 riastradh Exp $ */ +/* $NetBSD: uaccess.h,v 1.8 2021/12/19 01:59:41 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -36,6 +36,8 @@ #include #include +#include + /* XXX This is a cop-out. */ #define VERIFY_READ 0 #define VERIFY_WRITE 1
CVS commit: src/sys/external/bsd/drm2/include/asm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:59:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/asm: uaccess.h Log Message: linux/compiler.h for #define __user Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/include/asm/uaccess.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:59:34 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_cdevsw.c
Log Message:
some declarations are now guarded under CONFIG_DRM_LEGACY.
Put our code under CONFIG_DRM_LEGACY, too, for now.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 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.21 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.22
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.21 Sun Dec 19 01:59:19 2021
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Dec 19 01:59:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cdevsw.c,v 1.21 2021/12/19 01:59:19 riastradh Exp $ */
+/* $NetBSD: drm_cdevsw.c,v 1.22 2021/12/19 01:59:34 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.21 2021/12/19 01:59:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.22 2021/12/19 01:59:34 riastradh Exp $");
#include
#include
@@ -80,6 +80,8 @@ static int drm_kqfilter(struct file *, s
static int drm_stat(struct file *, struct stat *);
static int drm_fop_mmap(struct file *, off_t *, size_t, int, int *, int *,
struct uvm_object **, int *);
+static void drm_requeue_event(struct drm_file *, struct drm_pending_event *);
+
static paddr_t drm_legacy_mmap(dev_t, off_t, int);
const struct cdevsw drm_cdevsw = {
@@ -239,7 +241,9 @@ drm_firstopen(struct drm_device *dev)
return 0;
fail2: __unused
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
drm_legacy_dma_takedown(dev);
+#endif
fail1: if (dev->driver->lastclose)
(*dev->driver->lastclose)(dev);
fail0: KASSERT(ret);
@@ -259,15 +263,19 @@ drm_lastclose(struct drm_device *dev)
mutex_lock(>struct_mutex);
if (dev->agp)
drm_legacy_agp_clear(dev);
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
drm_legacy_sg_cleanup(dev);
drm_legacy_dma_takedown(dev);
+#endif
mutex_unlock(>struct_mutex);
/* XXX Synchronize with drm_legacy_dev_reinit. */
if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
dev->sigdata.lock = NULL;
dev->context_flag = 0;
dev->last_context = 0;
+#endif
dev->if_version = 0;
}
}
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:59:34 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_cdevsw.c Log Message: some declarations are now guarded under CONFIG_DRM_LEGACY. Put our code under CONFIG_DRM_LEGACY, too, for now. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 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 01:59:27 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: skip upstream drm_cache.c, we have our own Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 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.48 src/sys/external/bsd/drm2/drm/files.drmkms:1.49 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.48 Sun Dec 19 01:51:37 2021 +++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 01:59:27 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.48 2021/12/19 01:51:37 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.49 2021/12/19 01:59:27 riastradh Exp $ version 20180827 @@ -80,7 +80,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/dist/drm/drm_cache.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
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:59:27 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: skip upstream drm_cache.c, we have our own Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 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 01:59:19 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_cdevsw.c Log Message: Include some headers now that drmP.h got split off. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 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.20 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.21 --- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.20 Sun Dec 19 00:58:11 2021 +++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Dec 19 01:59:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_cdevsw.c,v 1.20 2021/12/19 00:58:11 riastradh Exp $ */ +/* $NetBSD: drm_cdevsw.c,v 1.21 2021/12/19 01:59:19 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.20 2021/12/19 00:58:11 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.21 2021/12/19 01:59:19 riastradh Exp $"); #include #include @@ -58,6 +58,9 @@ __KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c #include #include +#include +#include +#include #include "../dist/drm/drm_internal.h" #include "../dist/drm/drm_legacy.h"
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:59:19 UTC 2021 Modified Files: src/sys/external/bsd/drm2/drm: drm_cdevsw.c Log Message: Include some headers now that drmP.h got split off. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 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/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:59:11 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
Log Message:
Remove more things defined in headers off drmP.h
(either drm_internal.h, drm_drv.h, drm_debugfs.h)
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.58 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.59
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.58 Sun Dec 19 01:59:03 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:59:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.58 2021/12/19 01:59:03 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.59 2021/12/19 01:59:11 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -165,28 +165,6 @@ extern void drm_unplug_dev(struct drm_de
extern unsigned int drm_debug;
extern bool drm_atomic;
-/* Debugfs support */
-#if defined(CONFIG_DEBUG_FS)
-extern int drm_debugfs_create_files(const struct drm_info_list *files,
-int count, struct dentry *root,
-struct drm_minor *minor);
-extern int drm_debugfs_remove_files(const struct drm_info_list *files,
-int count, struct drm_minor *minor);
-#else
-static inline int drm_debugfs_create_files(const struct drm_info_list *files,
- int count, struct dentry *root,
- struct drm_minor *minor)
-{
- return 0;
-}
-
-static inline int drm_debugfs_remove_files(const struct drm_info_list *files,
- int count, struct drm_minor *minor)
-{
- return 0;
-}
-#endif
-
int drm_pci_set_unique(struct drm_device *dev,
struct drm_master *master,
struct drm_unique *u);
@@ -194,21 +172,6 @@ extern struct drm_dma_handle *drm_pci_al
size_t align);
extern void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah);
- /* sysfs support (drm_sysfs.c) */
-extern void drm_sysfs_hotplug_event(struct drm_device *dev);
-
-
-struct drm_device *drm_dev_alloc(struct drm_driver *driver,
- struct device *parent);
-void drm_dev_ref(struct drm_device *dev);
-void drm_dev_unref(struct drm_device *dev);
-int drm_dev_register(struct drm_device *dev, unsigned long flags);
-void drm_dev_unregister(struct drm_device *dev);
-int drm_dev_set_unique(struct drm_device *dev, const char *fmt, ...);
-
-struct drm_minor *drm_minor_acquire(unsigned int minor_id);
-void drm_minor_release(struct drm_minor *minor);
-
#ifdef __NetBSD__
int drm_limit_dma_space(struct drm_device *, resource_size_t, resource_size_t);
int drm_guarantee_initialized(void);
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:59:11 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Remove more things defined in headers off drmP.h (either drm_internal.h, drm_drv.h, drm_debugfs.h) Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/external/bsd/drm2/dist/include/drm/drmP.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:59:03 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_file.h
drm_prime.h
Log Message:
Move more ifdef NetBSD goo from drmP.h to new headers
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/include/drm/drm_file.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/include/drm/drm_prime.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.57 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.58
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.57 Sun Dec 19 01:57:20 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:59:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.57 2021/12/19 01:57:20 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.58 2021/12/19 01:59:03 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -102,7 +102,6 @@ struct drm_agp_head;
struct drm_local_map;
struct drm_device_dma;
struct drm_dma_handle;
-struct drm_gem_object;
struct drm_bus_irq_cookie;
struct device_node;
@@ -116,49 +115,6 @@ struct dma_buf_attachment;
#define DRM_IF_VERSION(maj, min) (maj << 16 | min)
-/**
- * Ioctl function type.
- *
- * \param inode device inode.
- * \param file_priv DRM file private pointer.
- * \param cmd command.
- * \param arg argument.
- */
-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-
-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
- unsigned long arg);
-
-/**
- * Creates a driver or general drm_ioctl_desc array entry for the given
- * ioctl, for use by drm_ioctl().
- */
-
-#define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags)\
- [DRM_IOCTL_NR(DRM_IOCTL_##ioctl) - DRM_COMMAND_BASE] = { \
- .cmd = DRM_IOCTL_##ioctl,\
- .func = _func, \
- .flags = _flags, \
- .name = #ioctl \
- }
-
-/* Event queued up for userspace to read */
-struct drm_pending_event {
- struct drm_event *event;
- struct list_head link;
- struct drm_file *file_priv;
- pid_t pid; /* pid of requester, no guarantee it's valid by the time
- we deliver the event, for tracing only */
- void (*destroy)(struct drm_pending_event *event);
-};
-
-/* initial implementaton using a linked list - todo hashtab */
-struct drm_prime_file_private {
- struct list_head head;
- struct mutex lock;
-};
-
#ifdef __NetBSD__ /* XXX debugfs */
struct seq_file;
#endif
@@ -184,25 +140,6 @@ struct drm_info_node {
struct dentry *dent;
};
-/**
- * DRM minor structure. This structure represents a drm minor number.
- */
-struct drm_minor {
- int index; /**< Minor device number */
- int type; /**< Control or render */
- struct device *kdev; /**< Linux device */
- struct drm_device *dev;
-
-#ifndef __NetBSD__ /* XXX debugfs */
- struct dentry *debugfs_root;
-
- struct list_head debugfs_list;
- struct mutex debugfs_lock; /* Protects debugfs_list. */
-#endif
-
- /* currently active master for this node. Protected by master_mutex */
- struct drm_master *master;
-};
/**/
/** \name Internal function definitions */
@@ -250,34 +187,6 @@ static inline int drm_debugfs_remove_fil
}
#endif
-extern struct dma_buf *drm_gem_prime_export(struct drm_device *dev,
- struct drm_gem_object *obj,
- int flags);
-extern int drm_gem_prime_handle_to_fd(struct drm_device *dev,
- struct drm_file *file_priv, uint32_t handle, uint32_t flags,
- int *prime_fd);
-extern struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
- struct dma_buf *dma_buf);
-extern int drm_gem_prime_fd_to_handle(struct drm_device *dev,
- struct drm_file *file_priv, int prime_fd, uint32_t *handle);
-extern void drm_gem_dmabuf_release(struct dma_buf *dma_buf);
-
-#ifdef __NetBSD__
-extern struct sg_table *drm_prime_bus_dmamem_to_sg(bus_dma_tag_t, const bus_dma_segment_t *, int);
-extern struct sg_table *drm_prime_pglist_to_sg(struct pglist *, unsigned);
-extern int drm_prime_sg_to_bus_dmamem(bus_dma_tag_t, bus_dma_segment_t *, int, int *, const struct sg_table *);
-extern int drm_prime_bus_dmamap_load_sgt(bus_dma_tag_t, bus_dmamap_t, struct sg_table *);
-extern bus_size_t drm_prime_sg_size(struct sg_table *);
-extern void drm_prime_sg_free(struct sg_table *);
-extern bool drm_prime_sg_importable(bus_dma_tag_t, struct sg_table *);
-#else
-extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
- dma_addr_t *addrs, int max_pages);
-#endif
-extern struct sg_table *drm_prime_pages_to_sg(struct page **pages,
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:59:03 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_file.h drm_prime.h Log Message: Move more ifdef NetBSD goo from drmP.h to new headers Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm2/dist/include/drm/drm_file.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/include/drm/drm_prime.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:55 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: list.h Log Message: provide list_for_each_entry_from (XXX needs review) Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/common/include/linux/list.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/common/include/linux/list.h diff -u src/sys/external/bsd/common/include/linux/list.h:1.23 src/sys/external/bsd/common/include/linux/list.h:1.24 --- src/sys/external/bsd/common/include/linux/list.h:1.23 Sun Dec 19 01:57:57 2021 +++ src/sys/external/bsd/common/include/linux/list.h Sun Dec 19 01:58:55 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: list.h,v 1.23 2021/12/19 01:57:57 riastradh Exp $ */ +/* $NetBSD: list.h,v 1.24 2021/12/19 01:58:55 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -291,6 +291,11 @@ list_del_init(struct list_head *node) &(VAR)->FIELD != (HEAD);\ (VAR) = list_prev_entry((VAR), FIELD)) +#define list_for_each_entry_from(VAR, HEAD, FIELD) \ + for (;\ + (&(VAR)->FIELD != (HEAD));\ + (VAR) = list_next_entry((VAR), FIELD)) + #define list_for_each_entry_safe_from(VAR, NEXT, HEAD, FIELD) \ for (;\ (&(VAR)->FIELD != (HEAD)) &&\
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:55 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: list.h Log Message: provide list_for_each_entry_from (XXX needs review) Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/common/include/linux/list.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:58:47 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/drm: drm_writeback.h
Log Message:
stub drm_writeback_set_fb
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/include/drm/drm_writeback.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/drm/drm_writeback.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.4 src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.5
--- src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.4 Sun Dec 19 01:58:11 2021
+++ src/sys/external/bsd/drm2/include/drm/drm_writeback.h Sun Dec 19 01:58:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_writeback.h,v 1.4 2021/12/19 01:58:11 riastradh Exp $ */
+/* $NetBSD: drm_writeback.h,v 1.5 2021/12/19 01:58:47 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -62,4 +62,13 @@ drm_writeback_prepare_job(struct drm_wri
return 0;
}
+static inline int
+drm_writeback_set_fb(struct drm_connector_state *conn_state,
+struct drm_framebuffer *fb)
+{
+
+ panic("TODO");
+ return 0;
+}
+
#endif /* _DRM_DRM_WRITEBACK_H_ */
CVS commit: src/sys/external/bsd/drm2/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:47 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/drm: drm_writeback.h Log Message: stub drm_writeback_set_fb Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/include/drm/drm_writeback.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:58:41 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_atomic_uapi.c
Log Message:
modify local diff to avoid shadowing
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c:1.5 src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c:1.5 Sun Dec 19 01:58:32 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c Sun Dec 19 01:58:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_atomic_uapi.c,v 1.5 2021/12/19 01:58:32 riastradh Exp $ */
+/* $NetBSD: drm_atomic_uapi.c,v 1.6 2021/12/19 01:58:41 riastradh Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_atomic_uapi.c,v 1.5 2021/12/19 01:58:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_atomic_uapi.c,v 1.6 2021/12/19 01:58:41 riastradh Exp $");
#include
#include
@@ -682,7 +682,6 @@ static int drm_atomic_connector_set_prop
struct drm_device *dev = connector->dev;
struct drm_mode_config *config = >mode_config;
bool replaced = false;
- int ret;
if (property == config->prop_crtc_id) {
struct drm_crtc *crtc = drm_crtc_find(dev, file_priv, val);
@@ -734,6 +733,7 @@ static int drm_atomic_connector_set_prop
if (state->link_status != DRM_LINK_STATUS_GOOD)
state->link_status = val;
} else if (property == config->hdr_output_metadata_property) {
+ int ret;
ret = drm_atomic_replace_property_blob_from_id(dev,
>hdr_output_metadata,
val,
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_atomic_uapi.c Log Message: modify local diff to avoid shadowing Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:58:32 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_atomic_uapi.c
Log Message:
PRIx64
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c:1.4 src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c:1.4 Sun Dec 19 01:15:56 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c Sun Dec 19 01:58:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_atomic_uapi.c,v 1.4 2021/12/19 01:15:56 riastradh Exp $ */
+/* $NetBSD: drm_atomic_uapi.c,v 1.5 2021/12/19 01:58:32 riastradh Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_atomic_uapi.c,v 1.4 2021/12/19 01:15:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_atomic_uapi.c,v 1.5 2021/12/19 01:58:32 riastradh Exp $");
#include
#include
@@ -569,7 +569,7 @@ static int drm_atomic_plane_set_property
state->pixel_blend_mode = val;
} else if (property == plane->rotation_property) {
if (!is_power_of_2(val & DRM_MODE_ROTATE_MASK)) {
- DRM_DEBUG_ATOMIC("[PLANE:%d:%s] bad rotation bitmask: 0x%llx\n",
+ DRM_DEBUG_ATOMIC("[PLANE:%d:%s] bad rotation bitmask: 0x%"PRIx64"\n",
plane->base.id, plane->name, val);
return -EINVAL;
}
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:32 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_atomic_uapi.c Log Message: PRIx64 Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/drm_atomic_uapi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:25 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_atomic_uapi.h Log Message: linux/compiler.h for __must_check Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_atomic_uapi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/include/drm/drm_atomic_uapi.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_atomic_uapi.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_atomic_uapi.h:1.3 --- src/sys/external/bsd/drm2/dist/include/drm/drm_atomic_uapi.h:1.2 Sat Dec 18 23:45:45 2021 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_atomic_uapi.h Sun Dec 19 01:58:25 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_atomic_uapi.h,v 1.2 2021/12/18 23:45:45 riastradh Exp $ */ +/* $NetBSD: drm_atomic_uapi.h,v 1.3 2021/12/19 01:58:25 riastradh Exp $ */ /* * Copyright (C) 2014 Red Hat @@ -31,6 +31,8 @@ #ifndef DRM_ATOMIC_UAPI_H_ #define DRM_ATOMIC_UAPI_H_ +#include + struct drm_crtc_state; struct drm_display_mode; struct drm_property_blob;
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:25 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_atomic_uapi.h Log Message: linux/compiler.h for __must_check Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_atomic_uapi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:58:18 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: ktime.h
Log Message:
provide ktime_ms_delta
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/include/linux/ktime.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/ktime.h
diff -u src/sys/external/bsd/drm2/include/linux/ktime.h:1.14 src/sys/external/bsd/drm2/include/linux/ktime.h:1.15
--- src/sys/external/bsd/drm2/include/linux/ktime.h:1.14 Sun Dec 19 01:25:58 2021
+++ src/sys/external/bsd/drm2/include/linux/ktime.h Sun Dec 19 01:58:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ktime.h,v 1.14 2021/12/19 01:25:58 riastradh Exp $ */
+/* $NetBSD: ktime.h,v 1.15 2021/12/19 01:58:18 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -54,6 +54,12 @@ ktime_to_us(ktime_t kt)
return ktime_to_ns(kt)/1000;
}
+static inline int64_t
+ktime_to_ms(ktime_t kt)
+{
+ return ktime_to_ns(kt)/100;
+}
+
static inline ktime_t
ns_to_ktime(int64_t nsec)
{
@@ -166,6 +172,13 @@ ktime_us_delta(ktime_t a, ktime_t b)
return ktime_to_us(ktime_sub(a, b));
}
+static inline int64_t
+ktime_ms_delta(ktime_t a, ktime_t b)
+{
+ return ktime_to_ms(ktime_sub(a, b));
+}
+
+
static inline bool
time_in_range(unsigned long x, unsigned long a, unsigned long b)
{
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:18 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: ktime.h Log Message: provide ktime_ms_delta Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/include/linux/ktime.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:58:11 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/drm: drm_writeback.h
Log Message:
provide a stub drm_writeback_prepare_job, knf
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/include/drm/drm_writeback.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/drm/drm_writeback.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.3 src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.4
--- src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.3 Sun Dec 19 01:57:49 2021
+++ src/sys/external/bsd/drm2/include/drm/drm_writeback.h Sun Dec 19 01:58:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_writeback.h,v 1.3 2021/12/19 01:57:49 riastradh Exp $ */
+/* $NetBSD: drm_writeback.h,v 1.4 2021/12/19 01:58:11 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -48,8 +48,18 @@ struct dma_fence *
drm_writeback_get_out_fence(struct drm_writeback_connector *);
static inline void
-drm_writeback_cleanup_job(struct drm_writeback_job *job) {
+drm_writeback_cleanup_job(struct drm_writeback_job *job)
+{
+
+ panic("TODO");
+}
+
+static inline int
+drm_writeback_prepare_job(struct drm_writeback_job *job)
+{
+
panic("TODO");
+ return 0;
}
#endif /* _DRM_DRM_WRITEBACK_H_ */
CVS commit: src/sys/external/bsd/drm2/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:11 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/drm: drm_writeback.h Log Message: provide a stub drm_writeback_prepare_job, knf Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/include/drm/drm_writeback.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:04 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_vblank.h Log Message: make this a real function declaration Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h:1.7 src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h:1.8 --- src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h:1.7 Sun Dec 19 01:56:33 2021 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h Sun Dec 19 01:58:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_vblank.h,v 1.7 2021/12/19 01:56:33 riastradh Exp $ */ +/* $NetBSD: drm_vblank.h,v 1.8 2021/12/19 01:58:04 riastradh Exp $ */ /* * Copyright 2016 Intel Corp. @@ -252,7 +252,7 @@ bool drm_calc_vbltimestamp_from_scanoutp void drm_calc_timestamping_constants(struct drm_crtc *crtc, const struct drm_display_mode *mode); #ifdef __NetBSD__ -drm_waitqueue_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc) +drm_waitqueue_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc); #else wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc); #endif
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:58:04 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_vblank.h Log Message: make this a real function declaration Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:57:57 UTC 2021
Modified Files:
src/sys/external/bsd/common/include/linux: list.h
Log Message:
provide list_is_first
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/common/include/linux/list.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/common/include/linux/list.h
diff -u src/sys/external/bsd/common/include/linux/list.h:1.22 src/sys/external/bsd/common/include/linux/list.h:1.23
--- src/sys/external/bsd/common/include/linux/list.h:1.22 Sun Dec 19 01:46:23 2021
+++ src/sys/external/bsd/common/include/linux/list.h Sun Dec 19 01:57:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: list.h,v 1.22 2021/12/19 01:46:23 riastradh Exp $ */
+/* $NetBSD: list.h,v 1.23 2021/12/19 01:57:57 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -108,6 +108,13 @@ list_is_singular(const struct list_head
}
static inline bool
+list_is_first(const struct list_head *entry, const struct list_head *head)
+{
+ return head == entry->prev;
+
+}
+
+static inline bool
list_is_last(const struct list_head *entry, const struct list_head *head)
{
return head == entry->next;
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:57 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: list.h Log Message: provide list_is_first Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/common/include/linux/list.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:57:49 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/drm: drm_writeback.h
Log Message:
Remove GPL header for which we have our own code
stub drm_writeback_cleanup_job
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/include/drm/drm_writeback.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/drm/drm_writeback.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.2 src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.3
--- src/sys/external/bsd/drm2/include/drm/drm_writeback.h:1.2 Sun Dec 19 00:49:29 2021
+++ src/sys/external/bsd/drm2/include/drm/drm_writeback.h Sun Dec 19 01:57:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_writeback.h,v 1.2 2021/12/19 00:49:29 riastradh Exp $ */
+/* $NetBSD: drm_writeback.h,v 1.3 2021/12/19 01:57:49 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -47,4 +47,9 @@ struct drm_writeback_connector *
struct dma_fence *
drm_writeback_get_out_fence(struct drm_writeback_connector *);
+static inline void
+drm_writeback_cleanup_job(struct drm_writeback_job *job) {
+ panic("TODO");
+}
+
#endif /* _DRM_DRM_WRITEBACK_H_ */
CVS commit: src/sys/external/bsd/drm2/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:49 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/drm: drm_writeback.h Log Message: Remove GPL header for which we have our own code stub drm_writeback_cleanup_job Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/include/drm/drm_writeback.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:42 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: completion.h Log Message: sys/kernel.h for hardclock_ticks Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/sys/external/bsd/common/include/linux/completion.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/common/include/linux/completion.h diff -u src/sys/external/bsd/common/include/linux/completion.h:1.9 src/sys/external/bsd/common/include/linux/completion.h:1.10 --- src/sys/external/bsd/common/include/linux/completion.h:1.9 Sun Dec 19 01:57:27 2021 +++ src/sys/external/bsd/common/include/linux/completion.h Sun Dec 19 01:57:42 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: completion.h,v 1.9 2021/12/19 01:57:27 riastradh Exp $ */ +/* $NetBSD: completion.h,v 1.10 2021/12/19 01:57:42 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -48,6 +48,7 @@ #include #include +#include #include #include
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:42 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: completion.h Log Message: sys/kernel.h for hardclock_ticks Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/sys/external/bsd/common/include/linux/completion.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:35 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_atomic.h Log Message: Give up and include linux/completion.h instead of figuring out how it's supposed to be side-loaded Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/include/drm/drm_atomic.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/include/drm/drm_atomic.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_atomic.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_atomic.h:1.4 --- src/sys/external/bsd/drm2/dist/include/drm/drm_atomic.h:1.3 Sat Dec 18 23:45:45 2021 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_atomic.h Sun Dec 19 01:57:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_atomic.h,v 1.3 2021/12/18 23:45:45 riastradh Exp $ */ +/* $NetBSD: drm_atomic.h,v 1.4 2021/12/19 01:57:35 riastradh Exp $ */ /* * Copyright (C) 2014 Red Hat @@ -30,6 +30,7 @@ #ifndef DRM_ATOMIC_H_ #define DRM_ATOMIC_H_ +#include #include #include
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:35 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_atomic.h Log Message: Give up and include linux/completion.h instead of figuring out how it's supposed to be side-loaded Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/include/drm/drm_atomic.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:27 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: completion.h Log Message: sys/param.h for KASSERT etc Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/common/include/linux/completion.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/common/include/linux/completion.h diff -u src/sys/external/bsd/common/include/linux/completion.h:1.8 src/sys/external/bsd/common/include/linux/completion.h:1.9 --- src/sys/external/bsd/common/include/linux/completion.h:1.8 Sun Dec 19 00:56:25 2021 +++ src/sys/external/bsd/common/include/linux/completion.h Sun Dec 19 01:57:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: completion.h,v 1.8 2021/12/19 00:56:25 riastradh Exp $ */ +/* $NetBSD: completion.h,v 1.9 2021/12/19 01:57:27 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -47,6 +47,7 @@ #define _LINUX_COMPLETION_H_ #include +#include #include #include
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:27 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: completion.h Log Message: sys/param.h for KASSERT etc Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/common/include/linux/completion.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:57:21 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_file.h
Log Message:
move ifdef goo from drmP.h to drm_file.h
Remove declarations already appearing in other headers
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/include/drm/drm_file.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.56 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.57
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.56 Sun Dec 19 01:57:13 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:57:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.56 2021/12/19 01:57:13 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.57 2021/12/19 01:57:20 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -209,33 +209,8 @@ struct drm_minor {
/*@{*/
/* Device support (drm_fops.h) */
-#ifdef __NetBSD__
-extern int drm_open_file(struct drm_file *, void *, struct drm_minor *);
-extern void drm_close_file(struct drm_file *);
-#else
-extern int drm_open(struct inode *inode, struct file *filp);
-extern ssize_t drm_read(struct file *filp, char __user *buffer,
- size_t count, loff_t *offset);
-extern int drm_release(struct inode *inode, struct file *filp);
-#endif
extern int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv);
-/* Mapping support (drm_vm.h) */
-#ifndef __NetBSD__
-extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
-#endif
-
-/* Misc. IOCTL support (drm_ioctl.c) */
-int drm_noop(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-int drm_invalid_op(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-
-/*
- * These are exported to drivers so that they can implement fencing using
- * DMA quiscent + idle. DMA quiescent usually requires the hardware lock.
- */
-
/* IRQ support (drm_irq.h) */
#ifdef __NetBSD__
extern int drm_irq_install(struct drm_device *dev);
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_file.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_file.h:1.5 src/sys/external/bsd/drm2/dist/include/drm/drm_file.h:1.6
--- src/sys/external/bsd/drm2/dist/include/drm/drm_file.h:1.5 Sun Dec 19 01:56:50 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_file.h Sun Dec 19 01:57:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_file.h,v 1.5 2021/12/19 01:56:50 riastradh Exp $ */
+/* $NetBSD: drm_file.h,v 1.6 2021/12/19 01:57:21 riastradh Exp $ */
/*
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -388,11 +388,16 @@ static inline bool drm_is_render_client(
return file_priv->minor->type == DRM_MINOR_RENDER;
}
+#ifdef __NetBSD__
+extern int drm_open_file(struct drm_file *, void *, struct drm_minor *);
+extern void drm_close_file(struct drm_file *);
+#else
int drm_open(struct inode *inode, struct file *filp);
ssize_t drm_read(struct file *filp, char __user *buffer,
size_t count, loff_t *offset);
int drm_release(struct inode *inode, struct file *filp);
__poll_t drm_poll(struct file *filp, struct poll_table_struct *wait);
+#endif
int drm_event_reserve_init_locked(struct drm_device *dev,
struct drm_file *file_priv,
struct drm_pending_event *p,
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:21 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_file.h Log Message: move ifdef goo from drmP.h to drm_file.h Remove declarations already appearing in other headers Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/include/drm/drm_file.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:57:13 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
Log Message:
Delete structs that got moved off to different files.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.55 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.56
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.55 Sun Dec 19 01:56:50 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:57:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.55 2021/12/19 01:56:50 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.56 2021/12/19 01:57:13 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -159,34 +159,6 @@ struct drm_prime_file_private {
struct mutex lock;
};
-/**
- * struct drm_master - drm master structure
- *
- * @refcount: Refcount for this master object.
- * @minor: Link back to minor char device we are master for. Immutable.
- * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex.
- * @unique_len: Length of unique field. Protected by drm_global_mutex.
- * @magic_map: Map of used authentication tokens. Protected by struct_mutex.
- * @lock: DRI lock information.
- * @driver_priv: Pointer to driver-private information.
- */
-struct drm_master {
- struct kref refcount;
- struct drm_minor *minor;
- char *unique;
- int unique_len;
- struct idr magic_map;
- struct drm_lock_data lock;
- void *driver_priv;
-};
-
-enum drm_minor_type {
- DRM_MINOR_LEGACY,
- DRM_MINOR_CONTROL,
- DRM_MINOR_RENDER,
- DRM_MINOR_CNT,
-};
-
#ifdef __NetBSD__ /* XXX debugfs */
struct seq_file;
#endif
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:13 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Delete structs that got moved off to different files. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/external/bsd/drm2/dist/include/drm/drmP.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:06 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_prime.h Log Message: Provide our own drm mmap declarations. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_prime.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/include/drm/drm_prime.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_prime.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_prime.h:1.3 --- src/sys/external/bsd/drm2/dist/include/drm/drm_prime.h:1.2 Sat Dec 18 23:45:46 2021 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_prime.h Sun Dec 19 01:57:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_prime.h,v 1.2 2021/12/18 23:45:46 riastradh Exp $ */ +/* $NetBSD: drm_prime.h,v 1.3 2021/12/19 01:57:06 riastradh Exp $ */ /* * Copyright © 2012 Red Hat @@ -87,8 +87,15 @@ void drm_gem_unmap_dma_buf(struct dma_bu void *drm_gem_dmabuf_vmap(struct dma_buf *dma_buf); void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr); +#ifdef __NetBSD__ +int gem_prime_mmap(struct drm_gem_object *, off_t *, size_t, int, int *, +int *, struct uvm_object **, int *); +int drm_gem_dmabuf_mmap(struct dma_buf *, off_t *, size_t, int, int *, +int *, struct uvm_object **, int *); +#else int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma); +#endif struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_pages); struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj,
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:57:06 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_prime.h Log Message: Provide our own drm mmap declarations. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_prime.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:56:58 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_prime.c Log Message: Don't call drm_gem_dmabuf_mmap static, upstream doesn't (guessing) Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/dist/drm/drm_prime.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/drm_prime.c diff -u src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.12 src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.13 --- src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.12 Sun Dec 19 01:53:39 2021 +++ src/sys/external/bsd/drm2/dist/drm/drm_prime.c Sun Dec 19 01:56:58 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_prime.c,v 1.12 2021/12/19 01:53:39 riastradh Exp $ */ +/* $NetBSD: drm_prime.c,v 1.13 2021/12/19 01:56:58 riastradh Exp $ */ /* * Copyright © 2012 Red Hat @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_prime.c,v 1.12 2021/12/19 01:53:39 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_prime.c,v 1.13 2021/12/19 01:56:58 riastradh Exp $"); #include #include @@ -990,7 +990,7 @@ EXPORT_SYMBOL(drm_gem_prime_mmap); * Returns 0 on success or a negative error code on failure. */ #ifdef __NetBSD__ -static int +int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, off_t *offp, size_t size, int prot, int *flagsp, int *advicep, struct uvm_object **uobjp, int *maxprotp)
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:56:58 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_prime.c Log Message: Don't call drm_gem_dmabuf_mmap static, upstream doesn't (guessing) Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/dist/drm/drm_prime.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:56:50 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_file.h
Log Message:
Move drm_file ifdef goo to the one defined in drm_file.h.
drm_lock_data is defined in drm_auth.h and already has the
ifdef goo.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/include/drm/drm_file.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.54 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.55
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.54 Sun Dec 19 01:56:42 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:56:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.54 2021/12/19 01:56:42 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.55 2021/12/19 01:56:50 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -159,89 +159,6 @@ struct drm_prime_file_private {
struct mutex lock;
};
-/** File private data */
-struct drm_file {
- unsigned authenticated :1;
- /* Whether we're master for a minor. Protected by master_mutex */
- unsigned is_master :1;
- /* true when the client has asked us to expose stereo 3D mode flags */
- unsigned stereo_allowed :1;
- /*
- * true if client understands CRTC primary planes and cursor planes
- * in the plane list
- */
- unsigned universal_planes:1;
- /* true if client understands atomic properties */
- unsigned atomic:1;
- /*
- * This client is allowed to gain master privileges for @master.
- * Protected by struct drm_device::master_mutex.
- */
- unsigned allowed_master:1;
-
-#ifndef __NetBSD__
- struct pid *pid;
- kuid_t uid;
-#endif
- drm_magic_t magic;
- struct list_head lhead;
- struct drm_minor *minor;
- unsigned long lock_count;
-
- /** Mapping of mm object handles to object pointers. */
- struct idr object_idr;
- /** Lock for synchronization of access to object_idr. */
- spinlock_t table_lock;
-
- struct file *filp;
- void *driver_priv;
-
- struct drm_master *master; /* master this node is currently associated with
- N.B. not always minor->master */
- /**
- * fbs - List of framebuffers associated with this file.
- *
- * Protected by fbs_lock. Note that the fbs list holds a reference on
- * the fb object to prevent it from untimely disappearing.
- */
- struct list_head fbs;
- struct mutex fbs_lock;
-
- /** User-created blob properties; this retains a reference on the
- * property. */
- struct list_head blobs;
-
-#ifdef __NetBSD__
- drm_waitqueue_t event_wait;
- struct selinfo event_selq;
-#else
- wait_queue_head_t event_wait;
-#endif
- struct list_head event_list;
- int event_space;
-
- struct drm_prime_file_private prime;
-};
-
-/**
- * Lock data.
- */
-struct drm_lock_data {
- struct drm_hw_lock *hw_lock; /**< Hardware lock */
- /** Private of lock holder's file (NULL=kernel) */
- struct drm_file *file_priv;
-#ifdef __NetBSD__
- drm_waitqueue_t lock_queue; /**< Queue of blocked processes */
-#else
- wait_queue_head_t lock_queue; /**< Queue of blocked processes */
-#endif
- unsigned long lock_time; /**< Time of last lock in jiffies */
- spinlock_t spinlock;
- uint32_t kernel_waiters;
- uint32_t user_waiters;
- int idle_has_lock;
-};
-
/**
* struct drm_master - drm master structure
*
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_file.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_file.h:1.4 src/sys/external/bsd/drm2/dist/include/drm/drm_file.h:1.5
--- src/sys/external/bsd/drm2/dist/include/drm/drm_file.h:1.4 Sun Dec 19 00:58:04 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_file.h Sun Dec 19 01:56:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_file.h,v 1.4 2021/12/19 00:58:04 riastradh Exp $ */
+/* $NetBSD: drm_file.h,v 1.5 2021/12/19 01:56:50 riastradh Exp $ */
/*
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -230,8 +230,10 @@ struct drm_file {
*/
struct drm_master *master;
+#ifndef __NetBSD__
/** @pid: Process that opened this file. */
struct pid *pid;
+#endif
/** @magic: Authentication magic, see @authenticated. */
drm_magic_t magic;
@@ -299,7 +301,12 @@ struct drm_file {
struct list_head blobs;
/** @event_wait: Waitqueue for new events added to @event_list. */
+#ifdef __NetBSD__
+ drm_waitqueue_t event_wait;
+ struct selinfo event_selq;
+#else
wait_queue_head_t event_wait;
+#endif
/**
* @pending_event_list:
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:56:50 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_file.h Log Message: Move drm_file ifdef goo to the one defined in drm_file.h. drm_lock_data is defined in drm_auth.h and already has the ifdef goo. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/include/drm/drm_file.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:56:43 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
Log Message:
Remove declarations that appear in other headers or are unused
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.53 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.54
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.53 Sun Dec 19 01:56:33 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:56:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.53 2021/12/19 01:56:33 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.54 2021/12/19 01:56:42 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -315,33 +315,6 @@ struct drm_minor {
struct drm_master *master;
};
-
-#define DRM_SWITCH_POWER_ON 0
-#define DRM_SWITCH_POWER_OFF 1
-#define DRM_SWITCH_POWER_CHANGING 2
-#define DRM_SWITCH_POWER_DYNAMIC_OFF 3
-
-static __inline__ int drm_core_check_feature(struct drm_device *dev,
- int feature)
-{
- return ((dev->driver->driver_features & feature) ? 1 : 0);
-}
-
-static inline bool drm_is_render_client(const struct drm_file *file_priv)
-{
- return file_priv->minor->type == DRM_MINOR_RENDER;
-}
-
-static inline bool drm_is_control_client(const struct drm_file *file_priv)
-{
- return file_priv->minor->type == DRM_MINOR_CONTROL;
-}
-
-static inline bool drm_is_primary_client(const struct drm_file *file_priv)
-{
- return file_priv->minor->type == DRM_MINOR_LEGACY;
-}
-
/**/
/** \name Internal function definitions */
/*@{*/
@@ -471,18 +444,6 @@ int drm_guarantee_initialized(void);
/*@}*/
/* PCI section */
-static __inline__ int drm_pci_device_is_agp(struct drm_device *dev)
-{
- if (dev->driver->device_is_agp != NULL) {
- int err = (*dev->driver->device_is_agp) (dev);
-
- if (err != 2) {
- return err;
- }
- }
-
- return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
-}
void drm_pci_agp_destroy(struct drm_device *dev);
extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:56:43 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Remove declarations that appear in other headers or are unused Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/external/bsd/drm2/dist/include/drm/drmP.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:56:33 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_drv.h
drm_vblank.h
Log Message:
Move drm_device ifdef goo to drm_drv.h
And drm vblank stuff to drm_vblank.h
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/include/drm/drm_drv.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.52 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.53
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.52 Sun Dec 19 01:56:24 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:56:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.52 2021/12/19 01:56:24 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.53 2021/12/19 01:56:33 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -263,288 +263,6 @@ struct drm_master {
void *driver_priv;
};
-/* Size of ringbuffer for vblank timestamps. Just double-buffer
- * in initial implementation.
- */
-#define DRM_VBLANKTIME_RBSIZE 2
-
-/* Flags and return codes for get_vblank_timestamp() driver function. */
-#define DRM_CALLED_FROM_VBLIRQ 1
-#define DRM_VBLANKTIME_SCANOUTPOS_METHOD (1 << 0)
-#define DRM_VBLANKTIME_IN_VBLANK (1 << 1)
-
-/* get_scanout_position() return flags */
-#define DRM_SCANOUTPOS_VALID(1 << 0)
-#define DRM_SCANOUTPOS_IN_VBLANK(1 << 1)
-#define DRM_SCANOUTPOS_ACCURATE (1 << 2)
-
-/**
- * DRM driver structure. This structure represent the common code for
- * a family of cards. There will one drm_device for each card present
- * in this family
- */
-struct drm_driver {
- int (*load) (struct drm_device *, unsigned long flags);
- int (*firstopen) (struct drm_device *);
- int (*open) (struct drm_device *, struct drm_file *);
- void (*preclose) (struct drm_device *, struct drm_file *file_priv);
- void (*postclose) (struct drm_device *, struct drm_file *);
- void (*lastclose) (struct drm_device *);
- int (*unload) (struct drm_device *);
- int (*suspend) (struct drm_device *, pm_message_t state);
- int (*resume) (struct drm_device *);
- int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
- int (*dma_quiescent) (struct drm_device *);
- int (*context_dtor) (struct drm_device *dev, int context);
- int (*set_busid)(struct drm_device *dev, struct drm_master *master);
- int (*set_unique)(struct drm_device *dev, struct drm_master *master,
- struct drm_unique *);
-
- /**
- * get_vblank_counter - get raw hardware vblank counter
- * @dev: DRM device
- * @pipe: counter to fetch
- *
- * Driver callback for fetching a raw hardware vblank counter for @crtc.
- * If a device doesn't have a hardware counter, the driver can simply
- * return the value of drm_vblank_count. The DRM core will account for
- * missed vblank events while interrupts where disabled based on system
- * timestamps.
- *
- * Wraparound handling and loss of events due to modesetting is dealt
- * with in the DRM core code.
- *
- * RETURNS
- * Raw vblank counter value.
- */
- u32 (*get_vblank_counter) (struct drm_device *dev, unsigned int pipe);
-
- /**
- * enable_vblank - enable vblank interrupt events
- * @dev: DRM device
- * @pipe: which irq to enable
- *
- * Enable vblank interrupts for @crtc. If the device doesn't have
- * a hardware vblank counter, this routine should be a no-op, since
- * interrupts will have to stay on to keep the count accurate.
- *
- * RETURNS
- * Zero on success, appropriate errno if the given @crtc's vblank
- * interrupt cannot be enabled.
- */
- int (*enable_vblank) (struct drm_device *dev, unsigned int pipe);
-
- /**
- * disable_vblank - disable vblank interrupt events
- * @dev: DRM device
- * @pipe: which irq to enable
- *
- * Disable vblank interrupts for @crtc. If the device doesn't have
- * a hardware vblank counter, this routine should be a no-op, since
- * interrupts will have to stay on to keep the count accurate.
- */
- void (*disable_vblank) (struct drm_device *dev, unsigned int pipe);
-
- /**
- * Called by \c drm_device_is_agp. Typically used to determine if a
- * card is really attached to AGP or not.
- *
- * \param dev DRM device handle
- *
- * \returns
- * One of three values is returned depending on whether or not the
- * card is absolutely \b not AGP (return of 0), absolutely \b is AGP
- * (return of 1), or may or may not be AGP (return of 2).
- */
- int (*device_is_agp) (struct drm_device *dev);
-
- /**
- * Called by vblank timestamping code.
- *
- * Return the current
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:56:33 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_drv.h drm_vblank.h Log Message: Move drm_device ifdef goo to drm_drv.h And drm vblank stuff to drm_vblank.h Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/include/drm/drm_drv.h cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:56:24 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
Log Message:
Remove drm_device_is_unplugged from drmP.h
Now defined in drm_drv.h.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.51 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.52
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.51 Sun Dec 19 01:56:16 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:56:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.51 2021/12/19 01:56:16 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.52 2021/12/19 01:56:24 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -641,13 +641,6 @@ static __inline__ int drm_core_check_fea
return ((dev->driver->driver_features & feature) ? 1 : 0);
}
-static inline int drm_device_is_unplugged(struct drm_device *dev)
-{
- int ret = atomic_read(>unplugged);
- smp_rmb();
- return ret;
-}
-
static inline bool drm_is_render_client(const struct drm_file *file_priv)
{
return file_priv->minor->type == DRM_MINOR_RENDER;
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:56:24 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Remove drm_device_is_unplugged from drmP.h Now defined in drm_drv.h. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/external/bsd/drm2/dist/include/drm/drmP.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:56:16 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
Log Message:
Remove unused function (local diff)
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.50 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.51
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.50 Sun Dec 19 01:56:08 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:56:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.50 2021/12/19 01:56:08 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.51 2021/12/19 01:56:16 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -641,12 +641,6 @@ static __inline__ int drm_core_check_fea
return ((dev->driver->driver_features & feature) ? 1 : 0);
}
-static inline void drm_device_set_unplugged(struct drm_device *dev)
-{
- smp_wmb();
- atomic_set(>unplugged, 1);
-}
-
static inline int drm_device_is_unplugged(struct drm_device *dev)
{
int ret = atomic_read(>unplugged);
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:56:16 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Remove unused function (local diff) Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/external/bsd/drm2/dist/include/drm/drmP.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:56:08 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_ioctl.h
Log Message:
move drmP drm_ioctl stuff to drm_ioctl.h
including ifdef goo
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.49 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.50
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.49 Sun Dec 19 01:56:00 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:56:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.49 2021/12/19 01:56:00 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.50 2021/12/19 01:56:08 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -130,30 +130,6 @@ typedef int drm_ioctl_t(struct drm_devic
typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
unsigned long arg);
-#ifdef __NetBSD__
-/* XXX Kludge...is there a better way to do this? */
-#define DRM_IOCTL_NR(n) \
- (IOCBASECMD(n) &~ (IOC_DIRMASK | (IOCGROUP(n) << IOCGROUP_SHIFT)))
-#define DRM_MAJOR cdevsw_lookup_major(_cdevsw)
-#else
-#define DRM_IOCTL_NR(n)_IOC_NR(n)
-#define DRM_MAJOR 226
-#endif
-
-#define DRM_AUTH 0x1
-#define DRM_MASTER 0x2
-#define DRM_ROOT_ONLY 0x4
-#define DRM_CONTROL_ALLOW 0x8
-#define DRM_UNLOCKED 0x10
-#define DRM_RENDER_ALLOW 0x20
-
-struct drm_ioctl_desc {
- unsigned int cmd;
- int flags;
- drm_ioctl_t *func;
- const char *name;
-};
-
/**
* Creates a driver or general drm_ioctl_desc array entry for the given
* ioctl, for use by drm_ioctl().
@@ -697,20 +673,6 @@ static inline bool drm_is_primary_client
/** \name Internal function definitions */
/*@{*/
-/* Driver support (drm_drv.h) */
-extern int drm_ioctl_permit(u32 flags, struct drm_file *file_priv);
-#ifdef __NetBSD__
-extern int drm_ioctl(struct file *, unsigned long, void *);
-extern struct spinlock drm_minor_lock;
-extern struct idr drm_minors_idr;
-#else
-extern long drm_ioctl(struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern long drm_compat_ioctl(struct file *filp,
- unsigned int cmd, unsigned long arg);
-#endif
-extern bool drm_ioctl_flags(unsigned int nr, unsigned int *flags);
-
/* Device support (drm_fops.h) */
#ifdef __NetBSD__
extern int drm_open_file(struct drm_file *, void *, struct drm_minor *);
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h:1.4
--- src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h:1.3 Sun Dec 19 00:57:21 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h Sun Dec 19 01:56:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_ioctl.h,v 1.3 2021/12/19 00:57:21 riastradh Exp $ */
+/* $NetBSD: drm_ioctl.h,v 1.4 2021/12/19 01:56:08 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -69,8 +69,15 @@ typedef int drm_ioctl_t(struct drm_devic
typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
unsigned long arg);
+#ifdef __NetBSD__
+/* XXX Kludge...is there a better way to do this? */
+#define DRM_IOCTL_NR(n) \
+ (IOCBASECMD(n) &~ (IOC_DIRMASK | (IOCGROUP(n) << IOCGROUP_SHIFT)))
+#define DRM_MAJOR cdevsw_lookup_major(_cdevsw)
+#else
#define DRM_IOCTL_NR(n)_IOC_NR(n)
#define DRM_MAJOR 226
+#endif
/**
* enum drm_ioctl_flags - DRM ioctl flags
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:56:08 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_ioctl.h Log Message: move drmP drm_ioctl stuff to drm_ioctl.h including ifdef goo Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:56:00 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_util.h
Log Message:
drm_can_sleep now lives in drm_util.h, move ifdef goo there.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/include/drm/drm_util.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.48 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.49
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.48 Sun Dec 19 01:55:45 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:56:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.48 2021/12/19 01:55:45 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.49 2021/12/19 01:56:00 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -955,18 +955,6 @@ extern int drm_pcie_get_speed_cap_mask(s
extern int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device);
extern int drm_platform_set_busid(struct drm_device *d, struct drm_master *m);
-/* returns true if currently okay to sleep */
-static __inline__ bool drm_can_sleep(void)
-{
-#ifdef __NetBSD__
- return false; /* XXX */
-#else
- if (in_atomic() || in_dbg_master() || irqs_disabled())
- return false;
- return true;
-#endif
-}
-
#ifdef __NetBSD__
/* XXX This is pretty kludgerific. */
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_util.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_util.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_util.h:1.3
--- src/sys/external/bsd/drm2/dist/include/drm/drm_util.h:1.2 Sat Dec 18 23:45:46 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_util.h Sun Dec 19 01:56:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_util.h,v 1.2 2021/12/18 23:45:46 riastradh Exp $ */
+/* $NetBSD: drm_util.h,v 1.3 2021/12/19 01:56:00 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -77,9 +77,13 @@
*/
static inline bool drm_can_sleep(void)
{
+#ifdef __NetBSD__
+ return false; /* XXX */
+#else
if (in_atomic() || in_dbg_master() || irqs_disabled())
return false;
return true;
+#endif
}
#endif
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:56:00 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_util.h Log Message: drm_can_sleep now lives in drm_util.h, move ifdef goo there. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_util.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:53 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_modes.h Log Message: Provide a forward declaration for a struct. It's used in some function declarations here, easier than figuring out where it belongs. we don't have a definition of this, might need it later. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h:1.5 src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h:1.6 --- src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h:1.5 Sat Dec 18 23:45:46 2021 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h Sun Dec 19 01:55:52 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_modes.h,v 1.5 2021/12/18 23:45:46 riastradh Exp $ */ +/* $NetBSD: drm_modes.h,v 1.6 2021/12/19 01:55:52 riastradh Exp $ */ /* * Copyright © 2006 Keith Packard @@ -35,6 +35,7 @@ #include struct videomode; +struct device_node; /* * Note on terminology: here, for brevity and convenience, we refer to connector
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:53 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_modes.h Log Message: Provide a forward declaration for a struct. It's used in some function declarations here, easier than figuring out where it belongs. we don't have a definition of this, might need it later. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:55:45 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_device.h
Log Message:
struct drm_device is now in drm_device.h. move netbsd ifdef goo there
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/include/drm/drm_device.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.47 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.48
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.47 Sun Dec 19 01:55:37 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:55:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.47 2021/12/19 01:55:37 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.48 2021/12/19 01:55:45 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -654,159 +654,6 @@ struct drm_vblank_crtc {
once per disable */
};
-/**
- * DRM device structure. This structure represent a complete card that
- * may contain multiple heads.
- */
-struct drm_device {
- struct list_head legacy_dev_list;/**< list of devices per driver for stealth attach cleanup */
- int if_version; /**< Highest interface version set */
-
- /** \name Lifetime Management */
- /*@{ */
- struct kref ref; /**< Object ref-count */
- struct device *dev; /**< Device structure of bus-device */
- struct drm_driver *driver; /**< DRM driver managing the device */
- void *dev_private; /**< DRM driver private data */
- struct drm_minor *control; /**< Control node */
- struct drm_minor *primary; /**< Primary node */
- struct drm_minor *render; /**< Render node */
- atomic_t unplugged; /**< Flag whether dev is dead */
- struct inode *anon_inode; /**< inode for private address-space */
- char *unique;/**< unique name of the device */
- /*@} */
-
- /** \name Locks */
- /*@{ */
- struct mutex struct_mutex; /**< For others */
- struct mutex master_mutex; /**< For drm_minor::master and drm_file::is_master */
- /*@} */
-
- /** \name Usage Counters */
- /*@{ */
- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
- spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
- int buf_use; /**< Buffers in use -- cannot alloc */
- atomic_t buf_alloc; /**< Buffer allocation in progress */
- /*@} */
-
- struct list_head filelist;
-
- /** \name Memory management */
- /*@{ */
- struct list_head maplist; /**< Linked list of regions */
- struct drm_open_hash map_hash; /**< User token hash table for maps */
-
- /** \name Context handle management */
- /*@{ */
- struct list_head ctxlist; /**< Linked list of context handles */
- struct mutex ctxlist_mutex; /**< For ctxlist */
-
- struct idr ctx_idr;
-
- struct list_head vmalist; /**< List of vmas (for debugging) */
-
- /*@} */
-
- /** \name DMA support */
- /*@{ */
- struct drm_device_dma *dma; /**< Optional pointer for DMA support */
- /*@} */
-
- /** \name Context support */
- /*@{ */
-
- __volatile__ long context_flag; /**< Context swapping flag */
- int last_context; /**< Last current context */
- /*@} */
-
- /** \name VBLANK IRQ support */
- /*@{ */
- bool irq_enabled;
- int irq;
-#ifdef __NetBSD__
- struct drm_bus_irq_cookie *irq_cookie;
-#endif
-
- /*
- * At load time, disabling the vblank interrupt won't be allowed since
- * old clients may not call the modeset ioctl and therefore misbehave.
- * Once the modeset ioctl *has* been called though, we can safely
- * disable them when unused.
- */
- bool vblank_disable_allowed;
-
- /*
- * If true, vblank interrupt will be disabled immediately when the
- * refcount drops to zero, as opposed to via the vblank disable
- * timer.
- * This can be set to true it the hardware has a working vblank
- * counter and the driver uses drm_vblank_on() and drm_vblank_off()
- * appropriately.
- */
- bool vblank_disable_immediate;
-
- /* array of size num_crtcs */
- struct drm_vblank_crtc *vblank;
-
- spinlock_t vblank_time_lock;/**< Protects vblank count and time updates during vblank enable/disable */
- spinlock_t vbl_lock;
-
- u32 max_vblank_count; /**< size of vblank counter register */
-
- /**
- * List of events
- */
- struct list_head vblank_event_list;
- spinlock_t event_lock;
-
- /*@} */
-
- struct drm_agp_head *agp; /**< AGP data */
-
- struct pci_dev *pdev; /**< PCI device structure */
-#ifdef __alpha__
- struct pci_controller *hose;
-#endif
-
- struct platform_device *platformdev; /**< Platform device struture */
- struct virtio_device *virtdev;
-
-#ifdef __NetBSD__
- bus_space_tag_t bst;
- struct drm_bus_map *bus_maps;
- unsigned bus_nmaps;
- bus_dma_tag_t bus_dmat; /*
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:45 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_device.h Log Message: struct drm_device is now in drm_device.h. move netbsd ifdef goo there Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_device.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:55:37 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
Log Message:
Remove duplicate drm debug prints (now moved to debug_print.h)
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.46 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.47
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.46 Sun Dec 19 01:49:00 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:55:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.46 2021/12/19 01:49:00 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.47 2021/12/19 01:55:37 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -110,160 +110,6 @@ struct videomode;
struct reservation_object;
struct dma_buf_attachment;
-/*
- * 4 debug categories are defined:
- *
- * CORE: Used in the generic drm code: drm_ioctl.c, drm_mm.c, drm_memory.c, ...
- * This is the category used by the DRM_DEBUG() macro.
- *
- * DRIVER: Used in the vendor specific part of the driver: i915, radeon, ...
- * This is the category used by the DRM_DEBUG_DRIVER() macro.
- *
- * KMS: used in the modesetting code.
- * This is the category used by the DRM_DEBUG_KMS() macro.
- *
- * PRIME: used in the prime code.
- * This is the category used by the DRM_DEBUG_PRIME() macro.
- *
- * ATOMIC: used in the atomic code.
- * This is the category used by the DRM_DEBUG_ATOMIC() macro.
- *
- * VBL: used for verbose debug message in the vblank code
- * This is the category used by the DRM_DEBUG_VBL() macro.
- *
- * Enabling verbose debug messages is done through the drm.debug parameter,
- * each category being enabled by a bit.
- *
- * drm.debug=0x1 will enable CORE messages
- * drm.debug=0x2 will enable DRIVER messages
- * drm.debug=0x3 will enable CORE and DRIVER messages
- * ...
- * drm.debug=0x3f will enable all messages
- *
- * An interesting feature is that it's possible to enable verbose logging at
- * run-time by echoing the debug value in its sysfs node:
- * # echo 0xf > /sys/module/drm/parameters/debug
- */
-#define DRM_UT_CORE 0x01
-#define DRM_UT_DRIVER 0x02
-#define DRM_UT_KMS 0x04
-#define DRM_UT_PRIME 0x08
-#define DRM_UT_ATOMIC 0x10
-#define DRM_UT_VBL 0x20
-
-extern __printf(2, 3)
-void drm_ut_debug_printk(const char *function_name,
- const char *format, ...);
-extern __printf(4, 5)
-void drm_err(const char *file, int line, const char *func, const char *format, ...);
-
-/***/
-/** \name DRM template customization defaults */
-/*@{*/
-
-/* driver capabilities and requirements mask */
-#define DRIVER_USE_AGP 0x1
-#define DRIVER_PCI_DMA 0x8
-#define DRIVER_SG 0x10
-#define DRIVER_HAVE_DMA 0x20
-#define DRIVER_HAVE_IRQ 0x40
-#define DRIVER_IRQ_SHARED 0x80
-#define DRIVER_GEM 0x1000
-#define DRIVER_MODESET 0x2000
-#define DRIVER_PRIME 0x4000
-#define DRIVER_RENDER 0x8000
-#define DRIVER_ATOMIC 0x1
-#define DRIVER_KMS_LEGACY_CONTEXT 0x2
-
-/***/
-/** \name Macros to make printk easier */
-/*@{*/
-
-#define _DRM_PRINTK(once, level, fmt, ...)\
- do {\
- printk##once(KERN_##level "[" DRM_NAME "] " fmt, \
- ##__VA_ARGS__);\
- } while (0)
-
-#define DRM_INFO(fmt, ...) \
- _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
-#define DRM_NOTE(fmt, ...) \
- _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__)
-#define DRM_WARN(fmt, ...) \
- _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__)
-
-#define DRM_INFO_ONCE(fmt, ...) \
- _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__)
-#define DRM_NOTE_ONCE(fmt, ...) \
- _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__)
-#define DRM_WARN_ONCE(fmt, ...) \
- _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__)
-
-/**
- * Error output.
- *
- * \param fmt printf() like format string.
- * \param arg arguments
- */
-#define DRM_ERROR(fmt, ...)\
- drm_err(__FILE__, __LINE__, __func__, fmt, ##__VA_ARGS__)
-
-/**
- * Rate limited error output. Like DRM_ERROR() but won't flood the log.
- *
- * \param fmt printf() like format string.
- * \param arg arguments
- */
-#define DRM_ERROR_RATELIMITED(fmt, ...)\
-({ \
- static DEFINE_RATELIMIT_STATE(_rs,\
- DEFAULT_RATELIMIT_INTERVAL, \
- DEFAULT_RATELIMIT_BURST); \
- \
- if (__ratelimit(&_rs)) \
- drm_err(__FILE__, __LINE__, __func__, fmt, ##__VA_ARGS__);\
-})
-
-/**
- * Debug output.
- *
- * \param fmt printf() like format string.
- * \param arg arguments
- */
-#define DRM_DEBUG(fmt, args...) \
- do
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:37 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Remove duplicate drm debug prints (now moved to debug_print.h) Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/external/bsd/drm2/dist/include/drm/drmP.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:55:29 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: timer.h
Log Message:
Match argument name, and uintptr_t has a size-match to void*, might be a better
fit.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/include/linux/timer.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/timer.h
diff -u src/sys/external/bsd/drm2/include/linux/timer.h:1.8 src/sys/external/bsd/drm2/include/linux/timer.h:1.9
--- src/sys/external/bsd/drm2/include/linux/timer.h:1.8 Sun Dec 19 01:16:21 2021
+++ src/sys/external/bsd/drm2/include/linux/timer.h Sun Dec 19 01:55:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.h,v 1.8 2021/12/19 01:16:21 riastradh Exp $ */
+/* $NetBSD: timer.h,v 1.9 2021/12/19 01:55:29 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -51,14 +51,14 @@ struct timer_list {
static inline void
timer_setup(struct timer_list *timer, void (*fn)(struct timer_list *),
-unsigned flags)
+uintptr_t flags)
{
callout_init(>tl_callout, 0);
/* XXX Super-sketchy casts! */
callout_setfunc(>tl_callout, (void (*)(void *))(void *)fn,
- (void *)arg);
+ (void *)flags);
}
static inline void
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:29 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: timer.h Log Message: Match argument name, and uintptr_t has a size-match to void*, might be a better fit. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/include/linux/timer.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:21 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Comment out debugfs files, we probably don't want those. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.54 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.55 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.54 Sun Dec 19 01:51:37 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 01:55:21 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.54 2021/12/19 01:51:37 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.55 2021/12/19 01:55:21 riastradh Exp $ version 20180827 @@ -127,9 +127,9 @@ file external/bsd/drm2/dist/drm/i915/gem file external/bsd/drm2/dist/drm/i915/gem/i915_gem_tiling.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_userptr.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_wait.c i915drmkms -file external/bsd/drm2/dist/drm/i915/gt/debugfs_engines.c i915drmkms -file external/bsd/drm2/dist/drm/i915/gt/debugfs_gt.c i915drmkms -file external/bsd/drm2/dist/drm/i915/gt/debugfs_gt_pm.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/gt/debugfs_engines.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/gt/debugfs_gt.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/gt/debugfs_gt_pm.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/gen6_renderstate.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/gen7_renderstate.c i915drmkms
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:21 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Comment out debugfs files, we probably don't want those. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/asm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:55:14 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/asm: uaccess.h
Log Message:
Use ufetch(9) instead of removed subyte.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/include/asm/uaccess.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/asm/uaccess.h
diff -u src/sys/external/bsd/drm2/include/asm/uaccess.h:1.6 src/sys/external/bsd/drm2/include/asm/uaccess.h:1.7
--- src/sys/external/bsd/drm2/include/asm/uaccess.h:1.6 Sun Dec 19 01:39:41 2021
+++ src/sys/external/bsd/drm2/include/asm/uaccess.h Sun Dec 19 01:55:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uaccess.h,v 1.6 2021/12/19 01:39:41 riastradh Exp $ */
+/* $NetBSD: uaccess.h,v 1.7 2021/12/19 01:55:14 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@ clear_user(void __user *user_ptr, size_t
* out an int.
*/
while (n --> 0) {
- if (subyte(p, 0) != 0)
+ if (ustore_char(p, 0) != 0)
return ++n;
}
CVS commit: src/sys/external/bsd/drm2/include/asm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:14 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/asm: uaccess.h Log Message: Use ufetch(9) instead of removed subyte. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/include/asm/uaccess.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:55:05 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: hdmi.h
Log Message:
Stub hdmi structs
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/include/linux/hdmi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/hdmi.h
diff -u src/sys/external/bsd/drm2/include/linux/hdmi.h:1.7 src/sys/external/bsd/drm2/include/linux/hdmi.h:1.8
--- src/sys/external/bsd/drm2/include/linux/hdmi.h:1.7 Sun Dec 19 00:55:09 2021
+++ src/sys/external/bsd/drm2/include/linux/hdmi.h Sun Dec 19 01:55:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hdmi.h,v 1.7 2021/12/19 00:55:09 riastradh Exp $ */
+/* $NetBSD: hdmi.h,v 1.8 2021/12/19 01:55:05 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -554,4 +554,7 @@ hdmi_infoframe_pack(union hdmi_infoframe
}
}
+struct hdr_sink_metadata {};
+struct hdmi_drm_infoframe {};
+
#endif /* _LINUX_HDMI_H_ */
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:05 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: hdmi.h Log Message: Stub hdmi structs Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/include/linux/hdmi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:58 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: preempt.h Log Message: Provide in_atomic Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/preempt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/include/linux/preempt.h diff -u src/sys/external/bsd/drm2/include/linux/preempt.h:1.2 src/sys/external/bsd/drm2/include/linux/preempt.h:1.3 --- src/sys/external/bsd/drm2/include/linux/preempt.h:1.2 Tue Mar 18 18:20:43 2014 +++ src/sys/external/bsd/drm2/include/linux/preempt.h Sun Dec 19 01:54:58 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: preempt.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $ */ +/* $NetBSD: preempt.h,v 1.3 2021/12/19 01:54:58 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -37,4 +37,6 @@ #define preempt_disable kpreempt_disable #define preempt_enable kpreempt_enable +#define in_atomic() kpreempt_disabled() + #endif /* _LINUX_PREEMPT_H_ */
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:58 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: preempt.h Log Message: Provide in_atomic Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/preempt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:54:50 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: dma-resv.h xarray.h
Log Message:
stub xarray.h and dma-resv.h
Add some upstream side-loads and empty structs.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/include/linux/dma-resv.h \
src/sys/external/bsd/drm2/include/linux/xarray.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/dma-resv.h
diff -u src/sys/external/bsd/drm2/include/linux/dma-resv.h:1.1 src/sys/external/bsd/drm2/include/linux/dma-resv.h:1.2
--- src/sys/external/bsd/drm2/include/linux/dma-resv.h:1.1 Sun Dec 19 01:53:29 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-resv.h Sun Dec 19 01:54:50 2021
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2020 The NetBSD Foundation, Inc.
+ */
+
+#ifndef _LINUX_DMA_RESV_H_
+#define _LINUX_DMA_RESV_H_
+
+#include
+#include
+
+struct dma_resv {};
+
+#endif /* _LINUX_DMA_RESV_H_ */
Index: src/sys/external/bsd/drm2/include/linux/xarray.h
diff -u src/sys/external/bsd/drm2/include/linux/xarray.h:1.1 src/sys/external/bsd/drm2/include/linux/xarray.h:1.2
--- src/sys/external/bsd/drm2/include/linux/xarray.h:1.1 Sun Dec 19 01:53:29 2021
+++ src/sys/external/bsd/drm2/include/linux/xarray.h Sun Dec 19 01:54:50 2021
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2020 The NetBSD Foundation, Inc.
+ */
+
+#ifndef _LINUX_XARRAY_H_
+#define _LINUX_XARRAY_H_
+
+struct xarray;
+
+#endif /* _LINUX_XARRAY_H_ */
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:50 UTC 2021 Modified Files: src/sys/external/bsd/drm2/include/linux: dma-resv.h xarray.h Log Message: stub xarray.h and dma-resv.h Add some upstream side-loads and empty structs. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/include/linux/dma-resv.h \ src/sys/external/bsd/drm2/include/linux/xarray.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/uapi/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:43 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/uapi/drm: drm.h Log Message: Make sure we don't end up on the wrong side of this ifdef. We have our own block in this file and don't want two differing declarations of drm_handle_t. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h diff -u src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.5 src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.6 --- src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.5 Sun Dec 19 01:53:57 2021 +++ src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h Sun Dec 19 01:54:43 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm.h,v 1.5 2021/12/19 01:53:57 riastradh Exp $ */ +/* $NetBSD: drm.h,v 1.6 2021/12/19 01:54:43 riastradh Exp $ */ /** * \file drm.h @@ -38,7 +38,7 @@ #ifndef _DRM_H_ #define _DRM_H_ -#if defined(__KERNEL__) +#if defined(__linux__) && defined(__KERNEL__) #include #include
CVS commit: src/sys/external/bsd/drm2/dist/include/uapi/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:43 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/uapi/drm: drm.h Log Message: Make sure we don't end up on the wrong side of this ifdef. We have our own block in this file and don't want two differing declarations of drm_handle_t. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:54:35 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_gem.h
Log Message:
Put a guess for what the netbsd mmap type will be.
Probably the same as drm_gem_mmap_object?
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/include/drm/drm_gem.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_gem.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_gem.h:1.7 src/sys/external/bsd/drm2/dist/include/drm/drm_gem.h:1.8
--- src/sys/external/bsd/drm2/dist/include/drm/drm_gem.h:1.7 Sun Dec 19 00:59:10 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_gem.h Sun Dec 19 01:54:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem.h,v 1.7 2021/12/19 00:59:10 riastradh Exp $ */
+/* $NetBSD: drm_gem.h,v 1.8 2021/12/19 01:54:35 riastradh Exp $ */
#ifndef __DRM_GEM_H__
#define __DRM_GEM_H__
@@ -168,7 +168,12 @@ struct drm_gem_object_funcs {
* drm_gem_prime_mmap(). When @mmap is present @vm_ops is not
* used, the @mmap callback must set vma->vm_ops instead.
*/
+#ifdef __NetBSD__
+ int (*mmap)(struct drm_device *, off_t, size_t, int, struct uvm_object **,
+ voff_t *, struct file *);
+#else
int (*mmap)(struct drm_gem_object *obj, struct vm_area_struct *vma);
+#endif
/**
* @vm_ops:
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:35 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_gem.h Log Message: Put a guess for what the netbsd mmap type will be. Probably the same as drm_gem_mmap_object? Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/include/drm/drm_gem.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:54:28 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_auth.h
Log Message:
Use the netbsd-ish drm_waitqueue_t
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/include/drm/drm_auth.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_auth.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_auth.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_auth.h:1.4
--- src/sys/external/bsd/drm2/dist/include/drm/drm_auth.h:1.3 Sun Dec 19 01:01:42 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_auth.h Sun Dec 19 01:54:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_auth.h,v 1.3 2021/12/19 01:01:42 riastradh Exp $ */
+/* $NetBSD: drm_auth.h,v 1.4 2021/12/19 01:54:28 riastradh Exp $ */
#ifndef _DRM_AUTH_H_
#define _DRM_AUTH_H_
@@ -61,7 +61,11 @@ struct drm_master;
struct drm_lock_data {
struct drm_hw_lock *hw_lock;
struct drm_file *file_priv;
+#ifdef __NetBSD__
+ drm_waitqueue_t lock_queue; /**< Queue of blocked processes */
+#else
wait_queue_head_t lock_queue;
+#endif
unsigned long lock_time;
spinlock_t spinlock;
uint32_t kernel_waiters;
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:28 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_auth.h Log Message: Use the netbsd-ish drm_waitqueue_t Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/include/drm/drm_auth.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:20 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_print.c src/sys/external/bsd/drm2/dist/include/drm: drm_print.h Log Message: Comment out drm_print_regset32, not used in any of the drivers we use. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/drm_print.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_print.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/drm_print.c diff -u src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.4 src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.5 --- src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.4 Sun Dec 19 01:07:52 2021 +++ src/sys/external/bsd/drm2/dist/drm/drm_print.c Sun Dec 19 01:54:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_print.c,v 1.4 2021/12/19 01:07:52 riastradh Exp $ */ +/* $NetBSD: drm_print.c,v 1.5 2021/12/19 01:54:20 riastradh Exp $ */ /* * Copyright (C) 2016 Red Hat @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.4 2021/12/19 01:07:52 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.5 2021/12/19 01:54:20 riastradh Exp $"); #ifndef __NetBSD__ /* XXX ??? */ #define DEBUG /* for pr_debug() */ @@ -364,6 +364,7 @@ void __drm_err(const char *format, ...) } EXPORT_SYMBOL(__drm_err); +#ifndef __NetBSD__ /** * drm_print_regset32 - print the contents of registers to a * _printer stream. @@ -391,3 +392,4 @@ void drm_print_regset32(struct drm_print } } EXPORT_SYMBOL(drm_print_regset32); +#endif Index: src/sys/external/bsd/drm2/dist/include/drm/drm_print.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_print.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_print.h:1.3 --- src/sys/external/bsd/drm2/dist/include/drm/drm_print.h:1.2 Sat Dec 18 23:45:46 2021 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_print.h Sun Dec 19 01:54:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_print.h,v 1.2 2021/12/18 23:45:46 riastradh Exp $ */ +/* $NetBSD: drm_print.h,v 1.3 2021/12/19 01:54:20 riastradh Exp $ */ /* * Copyright (C) 2016 Red Hat @@ -93,7 +93,9 @@ void __drm_printfn_err(struct drm_printe __printf(2, 3) void drm_printf(struct drm_printer *p, const char *f, ...); void drm_puts(struct drm_printer *p, const char *str); +#ifndef __NetBSD__ void drm_print_regset32(struct drm_printer *p, struct debugfs_regset32 *regset); +#endif void drm_print_bits(struct drm_printer *p, unsigned long value, const char * const bits[], unsigned int nbits);
CVS commit: src/sys/external/bsd/drm2/dist
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:20 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_print.c src/sys/external/bsd/drm2/dist/include/drm: drm_print.h Log Message: Comment out drm_print_regset32, not used in any of the drivers we use. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/drm_print.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_print.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:12 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: bitops.h Log Message: Remove duplicate definition of BITS_PER_BYTE Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/common/include/linux/bitops.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/common/include/linux/bitops.h diff -u src/sys/external/bsd/common/include/linux/bitops.h:1.11 src/sys/external/bsd/common/include/linux/bitops.h:1.12 --- src/sys/external/bsd/common/include/linux/bitops.h:1.11 Sun Dec 19 01:33:59 2021 +++ src/sys/external/bsd/common/include/linux/bitops.h Sun Dec 19 01:54:12 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: bitops.h,v 1.11 2021/12/19 01:33:59 riastradh Exp $ */ +/* $NetBSD: bitops.h,v 1.12 2021/12/19 01:54:12 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -108,7 +108,6 @@ sign_extend64(uint64_t x, unsigned n) * turns up. */ -#define BITS_PER_BYTE 8 #define BITS_TO_LONGS(n) \ roundup2((n), (sizeof(unsigned long) * CHAR_BIT))
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:12 UTC 2021 Modified Files: src/sys/external/bsd/common/include/linux: bitops.h Log Message: Remove duplicate definition of BITS_PER_BYTE Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/common/include/linux/bitops.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:05 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_gemfs.c Log Message: Change local drm files include path to match upstream changes. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_gemfs.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/i915drm/i915_gemfs.c diff -u src/sys/external/bsd/drm2/i915drm/i915_gemfs.c:1.1 src/sys/external/bsd/drm2/i915drm/i915_gemfs.c:1.2 --- src/sys/external/bsd/drm2/i915drm/i915_gemfs.c:1.1 Sun Dec 19 01:40:34 2021 +++ src/sys/external/bsd/drm2/i915drm/i915_gemfs.c Sun Dec 19 01:54:05 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_gemfs.c,v 1.1 2021/12/19 01:40:34 riastradh Exp $ */ +/* $NetBSD: i915_gemfs.c,v 1.2 2021/12/19 01:54:05 riastradh Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,9 +30,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: i915_gemfs.c,v 1.1 2021/12/19 01:40:34 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_gemfs.c,v 1.2 2021/12/19 01:54:05 riastradh Exp $"); -#include "i915_gemfs.h" +#include "gem/i915_gemfs.h" int i915_gemfs_init(struct drm_i915_private *i915)
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:05 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_gemfs.c Log Message: Change local drm files include path to match upstream changes. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_gemfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/include/uapi/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:53:58 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/uapi/drm: drm.h Log Message: Uhm, we don't have stdint.h in kernel mode. Maybe sys/stdint.h? Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h diff -u src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.4 src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.5 --- src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.4 Sun Dec 19 00:47:09 2021 +++ src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h Sun Dec 19 01:53:57 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: drm.h,v 1.4 2021/12/19 00:47:09 riastradh Exp $ */ +/* $NetBSD: drm.h,v 1.5 2021/12/19 01:53:57 riastradh Exp $ */ /** * \file drm.h @@ -55,7 +55,7 @@ typedef unsigned int drm_handle_t; #endif #ifdef __NetBSD__ -#include +#include #include #include #include
CVS commit: src/sys/external/bsd/drm2/dist/include/uapi/drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:53:58 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/include/uapi/drm: drm.h Log Message: Uhm, we don't have stdint.h in kernel mode. Maybe sys/stdint.h? Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
