[src/riastradh-drm2]: src/sys Unhook drm_prime for now.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8a5af3d9a22e
branches:  riastradh-drm2
changeset: 788209:8a5af3d9a22e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 02:43:26 2013 +0000

description:
Unhook drm_prime for now.

diffstat:

 sys/external/bsd/drm2/drm/drm_drv.c  |   6 ++++--
 sys/external/bsd/drm2/drm/drm_fops.c |  10 ++++++++--
 sys/modules/drm2/Makefile            |   4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs (98 lines):

diff -r c95678901040 -r 8a5af3d9a22e sys/external/bsd/drm2/drm/drm_drv.c
--- a/sys/external/bsd/drm2/drm/drm_drv.c       Wed Jul 24 02:43:09 2013 +0000
+++ b/sys/external/bsd/drm2/drm/drm_drv.c       Wed Jul 24 02:43:26 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.c,v 1.1.2.5 2013/07/24 02:21:22 riastradh Exp $        */
+/*     $NetBSD: drm_drv.c,v 1.1.2.6 2013/07/24 02:43:26 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.5 2013/07/24 02:21:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.6 2013/07/24 02:43:26 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -155,8 +155,10 @@
 
        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_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE, drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED),
+#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),
diff -r c95678901040 -r 8a5af3d9a22e sys/external/bsd/drm2/drm/drm_fops.c
--- a/sys/external/bsd/drm2/drm/drm_fops.c      Wed Jul 24 02:43:09 2013 +0000
+++ b/sys/external/bsd/drm2/drm/drm_fops.c      Wed Jul 24 02:43:26 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_fops.c,v 1.1.2.2 2013/07/24 02:38:06 riastradh Exp $       */
+/*     $NetBSD: drm_fops.c,v 1.1.2.3 2013/07/24 02:43:26 riastradh Exp $       */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fops.c,v 1.1.2.2 2013/07/24 02:38:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fops.c,v 1.1.2.3 2013/07/24 02:43:26 riastradh Exp $");
 
 #include <drm/drmP.h>
 
@@ -77,8 +77,10 @@
        if (drm_core_check_feature(dev, DRIVER_GEM))
                drm_gem_open(dev, file);
 
+#ifndef __NetBSD__             /* XXX drm prime */
        if (drm_core_check_feature(dev, DRIVER_PRIME))
                drm_prime_init_file_private(&file->prime);
+#endif
 
        if (dev->driver->open) {
                error = (*dev->driver->open)(dev, file);
@@ -104,8 +106,10 @@
                (*dev->driver->postclose)(dev, file);
 
 fail1:
+#ifndef __NetBSD__             /* XXX drm prime */
        if (drm_core_check_feature(dev, DRIVER_PRIME))
                drm_prime_destroy_file_private(&file->prime);
+#endif
 
        if (drm_core_check_feature(dev, DRIVER_GEM))
                drm_gem_release(dev, file);
@@ -212,8 +216,10 @@
        if (dev->driver->postclose)
                (*dev->driver->postclose)(dev, file);
 
+#ifndef __NetBSD__             /* XXX drm prime */
        if (drm_core_check_feature(dev, DRIVER_PRIME))
                drm_prime_destroy_file_private(&file->prime);
+#endif
 
        atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
        if (--dev->open_count == 0) {
diff -r c95678901040 -r 8a5af3d9a22e sys/modules/drm2/Makefile
--- a/sys/modules/drm2/Makefile Wed Jul 24 02:43:09 2013 +0000
+++ b/sys/modules/drm2/Makefile Wed Jul 24 02:43:26 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.25 2013/07/24 02:43:09 riastradh Exp $
+# $NetBSD: Makefile,v 1.1.2.26 2013/07/24 02:43:26 riastradh Exp $
 
 .include "../Makefile.inc"
 .include "Makefile.inc"
@@ -39,7 +39,7 @@
 #SRCS+=        drm_modes.c             # XXX Rewrite if necessary.
 #SRCS+=        drm_pci.c               # XXX Move to drm2pci module.
 #SRCS+=        drm_platform.c          # XXX Rewrite per platform.
-SRCS+= drm_prime.c
+#SRCS+=        drm_prime.c             # XXX Revisit later.
 #SRCS+=        drm_proc.c              # XXX Rewrite for sysctl.
 #SRCS+=        drm_scatter.c           # XXX Rewrite for bus_dma(9).
 SRCS+= drm_stub.c