Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:55:06 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_ioctl.c
Log Message:
Disable drm prime ioctls for now.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.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_ioctl.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.6 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.6 Mon Aug 27 06:50:58 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c Mon Aug 27 07:55:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_ioctl.c,v 1.6 2018/08/27 06:50:58 riastradh Exp $ */
+/* $NetBSD: drm_ioctl.c,v 1.7 2018/08/27 07:55:06 riastradh Exp $ */
/*
* Created: Fri Jan 8 09:01:26 1999 by fa...@valinux.com
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.6 2018/08/27 06:50:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.7 2018/08/27 07:55:06 riastradh Exp $");
#include <drm/drmP.h>
#include <drm/drm_core.h>
@@ -665,8 +665,10 @@ static const struct drm_ioctl_desc drm_i
DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
+#ifndef __NetBSD__ /* XXX drm prime */
DRM_IOCTL_DEF(DRM_IOCTL_PRIME_HANDLE_TO_FD, drm_prime_handle_to_fd_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
DRM_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE, drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
+#endif
DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
