Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat/netbsd32 compat32 drm ioctl support from Surya Sh...
details: https://anonhg.NetBSD.org/src/rev/f2309c63a0b2
branches: trunk
changeset: 459006:f2309c63a0b2
user: christos <christos%NetBSD.org@localhost>
date: Tue Aug 20 09:32:21 2019 +0000
description:
compat32 drm ioctl support from Surya Shankar at GSoC 2019
diffstat:
sys/compat/netbsd32/files.netbsd32 | 6 +-
sys/compat/netbsd32/netbsd32_drm.c | 974 +++++++++++++++++++++++++++++++++++
sys/compat/netbsd32/netbsd32_ioctl.c | 10 +-
sys/compat/netbsd32/netbsd32_ioctl.h | 7 +-
4 files changed, 993 insertions(+), 4 deletions(-)
diffs (truncated from 1058 to 300 lines):
diff -r e959048e9d6b -r f2309c63a0b2 sys/compat/netbsd32/files.netbsd32
--- a/sys/compat/netbsd32/files.netbsd32 Tue Aug 20 09:28:00 2019 +0000
+++ b/sys/compat/netbsd32/files.netbsd32 Tue Aug 20 09:32:21 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.netbsd32,v 1.45 2019/06/18 01:36:50 christos Exp $
+# $NetBSD: files.netbsd32,v 1.46 2019/08/20 09:32:21 christos Exp $
#
# config file description for machine-independent netbsd32 compat code.
# included by ports that need it.
@@ -7,10 +7,14 @@
# own file lists.
define compat_netbsd32
+
+makeoptions drmkms CPPFLAGS+="-DNETBSD32_DRMKMS"
+
file compat/netbsd32/netbsd32_core.c compat_netbsd32 & coredump
file compat/netbsd32/netbsd32_exec_elf32.c compat_netbsd32 & exec_elf32
file compat/netbsd32/netbsd32_exec_aout.c compat_netbsd32 & exec_aout
file compat/netbsd32/netbsd32_netbsd.c compat_netbsd32
+file compat/netbsd32/netbsd32_drm.c compat_netbsd32 & drmkms
file compat/netbsd32/netbsd32_event.c compat_netbsd32
file compat/netbsd32/netbsd32_execve.c compat_netbsd32
file compat/netbsd32/netbsd32_fd.c compat_netbsd32
diff -r e959048e9d6b -r f2309c63a0b2 sys/compat/netbsd32/netbsd32_drm.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/compat/netbsd32/netbsd32_drm.c Tue Aug 20 09:32:21 2019 +0000
@@ -0,0 +1,974 @@
+/* $NetBSD: netbsd32_drm.c,v 1.1 2019/08/20 09:32:21 christos Exp $ */
+
+/*
+ * This code was written by Surya Shankar for GSoC 2019.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_drm.c,v 1.1 2019/08/20 09:32:21 christos Exp $");
+
+#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_ioctl.h>
+
+#include <linux/types.h>
+#include <drm/drmP.h>
+
+#define DRM_IOCTL_VERSION32 DRM_IOWR(0x00, drm_version32_t)
+#define DRM_IOCTL_GET_UNIQUE32 DRM_IOWR(0x01, drm_unique32_t)
+#define DRM_IOCTL_GET_MAP32 DRM_IOWR(0x04, drm_map32_t)
+#define DRM_IOCTL_GET_CLIENT32 DRM_IOWR(0x05, drm_client32_t)
+#define DRM_IOCTL_GET_STATS32 DRM_IOR( 0x06, drm_stats32_t)
+
+#define DRM_IOCTL_SET_UNIQUE32 DRM_IOW( 0x10, drm_unique32_t)
+#define DRM_IOCTL_ADD_MAP32 DRM_IOWR(0x15, drm_map32_t)
+#define DRM_IOCTL_ADD_BUFS32 DRM_IOWR(0x16, drm_buf_desc32_t)
+#define DRM_IOCTL_MARK_BUFS32 DRM_IOW( 0x17, drm_buf_desc32_t)
+#define DRM_IOCTL_INFO_BUFS32 DRM_IOWR(0x18, drm_buf_info32_t)
+#define DRM_IOCTL_MAP_BUFS32 DRM_IOWR(0x19, drm_buf_map32_t)
+#define DRM_IOCTL_FREE_BUFS32 DRM_IOW( 0x1a, drm_buf_free32_t)
+
+#define DRM_IOCTL_RM_MAP32 DRM_IOW( 0x1b, drm_map32_t)
+
+#define DRM_IOCTL_SET_SAREA_CTX32 DRM_IOW( 0x1c, drm_ctx_priv_map32_t)
+#define DRM_IOCTL_GET_SAREA_CTX32 DRM_IOWR(0x1d, drm_ctx_priv_map32_t)
+
+#define DRM_IOCTL_RES_CTX32 DRM_IOWR(0x26, drm_ctx_res32_t)
+#define DRM_IOCTL_DMA32 DRM_IOWR(0x29, drm_dma32_t)
+
+#define DRM_IOCTL_AGP_ENABLE32 DRM_IOW( 0x32, drm_agp_mode32_t)
+#define DRM_IOCTL_AGP_INFO32 DRM_IOR( 0x33, drm_agp_info32_t)
+#define DRM_IOCTL_AGP_ALLOC32 DRM_IOWR(0x34, drm_agp_buffer32_t)
+#define DRM_IOCTL_AGP_FREE32 DRM_IOW( 0x35, drm_agp_buffer32_t)
+#define DRM_IOCTL_AGP_BIND32 DRM_IOW( 0x36, drm_agp_binding32_t)
+#define DRM_IOCTL_AGP_UNBIND32 DRM_IOW( 0x37, drm_agp_binding32_t)
+
+#define DRM_IOCTL_SG_ALLOC32 DRM_IOW( 0x38, drm_scatter_gather32_t)
+#define DRM_IOCTL_SG_FREE32 DRM_IOW( 0x39, drm_scatter_gather32_t)
+
+#define DRM_IOCTL_UPDATE_DRAW32 DRM_IOW( 0x3f, drm_update_draw32_t)
+
+#define DRM_IOCTL_WAIT_VBLANK32 DRM_IOWR(0x3a, drm_wait_vblank32_t)
+
+#define DRM_IOCTL_MODE_ADDFB232 DRM_IOWR(0xb8, drm_mode_fb_cmd232_t)
+
+// Compat DRM Version Implementation
+
+typedef struct {
+ int version_major; /**< Major version */
+ int version_minor; /**< Minor version */
+ int version_patchlevel; /**< Patch level */
+ uint32_t name_len; /**< Length of name buffer */
+ netbsd32_pointer_t name; /**< Name of driver */
+ uint32_t date_len; /**< Length of date buffer */
+ netbsd32_pointer_t date; /**< User-space buffer to hold date */
+ uint32_t desc_len; /**< Length of desc buffer */
+ netbsd32_pointer_t desc; /**< User-space buffer to hold desc */
+} drm_version32_t;
+
+static int
+compat_drm_version(struct file *file, void *arg)
+{
+ drm_version32_t v32;
+ struct drm_version v64;
+ int error;
+
+ if ((error = copyin(&v32, arg, sizeof(v32))) != 0)
+ return error;
+
+ v64.name_len = v32.name_len;
+ v64.name = NETBSD32PTR64(v32.name);
+ v64.date_len = v32.date_len;
+ v64.date = NETBSD32PTR64(v32.date);
+ v64.desc_len = v32.desc_len;
+ v64.desc = NETBSD32PTR64(v32.desc);
+
+ error = drm_ioctl(file, DRM_IOCTL_VERSION, &v64);
+ if (error)
+ return error;
+
+ v32.version_major = v64.version_major;
+ v32.version_minor = v64.version_minor;
+ v32.version_patchlevel = v64.version_patchlevel;
+ /* strings have already been copied in place */
+ v32.name_len = v64.name_len;
+ v32.date_len = v64.date_len;
+ v32.desc_len = v64.desc_len;
+
+ return copyout(arg, &v32, sizeof(v32));
+}
+
+typedef struct drm_unique32 {
+ uint32_t unique_len;
+ netbsd32_pointer_t unique;
+} drm_unique32_t;
+
+static int
+compat_drm_getunique(struct file *file, void *arg)
+{
+ drm_unique32_t uq32;
+ struct drm_unique uq64;
+ int error;
+
+ if ((error = copyin(&uq32, arg, sizeof(uq32))) != 0)
+ return error;
+
+ uq64.unique_len = uq32.unique_len;
+ uq64.unique = NETBSD32PTR64(uq32.unique);
+
+ error = drm_ioctl(file, DRM_IOCTL_GET_UNIQUE, &uq64);
+ if (error)
+ return error;
+
+ //unique should already be copied
+ uq32.unique_len = uq64.unique_len;
+
+ if ((error = copyout(arg, &uq32, sizeof(uq32))) != 0)
+ return error;
+
+ return 0;
+}
+
+static int
+compat_drm_setunique(struct file *file, void *arg)
+{
+ drm_unique32_t uq32;
+ struct drm_unique uq64;
+ int error;
+
+ if ((error = copyin(&uq32, arg, sizeof(uq32))) != 0)
+ return error;
+
+ uq64.unique_len = uq32.unique_len;
+ uq64.unique = NETBSD32PTR64(uq32.unique);
+
+ error = drm_ioctl(file, DRM_IOCTL_SET_UNIQUE, &uq64);
+ if (error)
+ return error;
+
+ // XXX: do we need copyout and copying the fields here?
+ uq32.unique_len = uq64.unique_len;
+ NETBSD32PTR32(uq32.unique, uq64.unique);
+
+ return error;
+}
+
+typedef struct drm_map32 {
+ uint32_t offset; /**< Req. physical address (0 for SAREA) */
+ uint32_t size; /**< Requested physical size (bytes) */
+ enum drm_map_type type; /**< Type of memory to map */
+ enum drm_map_flags flags; /**< Flags */
+ netbsd32_pointer_t handle;/**< User-space: "Handle" to pass to mmap() */
+ int mtrr; /**< MTRR slot used */
+} drm_map32_t;
+
+static void
+map32to64(struct drm_map *m64, const drm_map32_t *m32)
+{
+ m64->offset = m32->offset;
+ m64->size = m32->size;
+ m64->type = m32->type;
+ m64->flags = m32->flags;
+ m64->handle = NETBSD32PTR64(m32->handle);
+ m64->mtrr = m32->mtrr;
+}
+
+static void
+map64to32(drm_map32_t *m32, const struct drm_map *m64)
+{
+ m32->offset = m64->offset;
+ m32->size = m64->size;
+ m32->type = m64->type;
+ m32->flags = m64->flags;
+ NETBSD32PTR32(m32->handle, m64->handle);
+ m32->mtrr = m64->mtrr;
+}
+
+static int
+compat_drm_getmap(struct file *file, void *arg)
+{
+ drm_map32_t m32;
+ struct drm_map m64;
+ int error;
+
+ if ((error = copyin(&m32, arg, sizeof(m32))) != 0)
+ return error;
+
+ map32to64(&m64, &m32);
+
+ error = drm_ioctl(file, DRM_IOCTL_GET_MAP, &m64);
+ if (error)
+ return error;
+
+ map64to32(&m32, &m64);
+
+ return copyout(arg, &m32, sizeof(m32));
+}
+
+static int
+compat_drm_addmap(struct file *file, void *arg)
+{
+ drm_map32_t m32;
+ struct drm_map m64;
+ int error;
+
+ if ((error = copyin(&m32, arg, sizeof(m32))) != 0)
+ return error;
+
+ map32to64(&m64, &m32);
+
+ error = drm_ioctl(file, DRM_IOCTL_ADD_MAP, &m64);
+ if (error)
+ return error;
+
+ map64to32(&m32, &m64);
+
+ return copyout(arg, &m32, sizeof(m32));
+}
+
+
+static int
+compat_drm_rmmap(struct file *file, void *arg)
+{
+ drm_map32_t m32;
+ struct drm_map m64;
+ int error;
+ if ((error = copyin(&m32, arg, sizeof(m32))) != 0)
+ return error;
+
+ map32to64(&m64, &m32);
+
+ error = drm_ioctl(file, DRM_IOCTL_RM_MAP, &m64);
+ if (error)
+ return error;
+
+ map64to32(&m32, &m64);
+
+ return copyout(arg, &m32, sizeof(m32));
+}
+
+typedef struct drm_client32 {
+ int idx; /**< Which client desired? */
+ int auth; /**< Is client authenticated? */
Home |
Main Index |
Thread Index |
Old Index