[src/trunk]: src/sys/external/bsd/drm2 Fix up drm_gem_cma_helper.

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

details:   https://anonhg.NetBSD.org/src/rev/2bdcf512ce58
branches:  trunk
changeset: 834926:2bdcf512ce58
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:57:00 2018 +0000

description:
Fix up drm_gem_cma_helper.

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h |  6 +++++-
 sys/external/bsd/drm2/drm/drm_gem_cma_helper.c              |  6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r 48d70abc0527 -r 2bdcf512ce58 sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h       Mon Aug 27 06:56:50 2018 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h       Mon Aug 27 06:57:00 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_gem_cma_helper.h,v 1.3 2018/08/27 04:58:37 riastradh Exp $ */
+/*     $NetBSD: drm_gem_cma_helper.h,v 1.4 2018/08/27 06:57:00 riastradh Exp $ */
 
 #ifndef __DRM_GEM_CMA_HELPER_H__
 #define __DRM_GEM_CMA_HELPER_H__
@@ -54,7 +54,9 @@
                                u64 *offset);
 
 /* set vm_flags and we can change the VM attribute to other one at here */
+#ifndef __NetBSD__
 int drm_gem_cma_mmap(struct file *filp, struct vm_area_struct *vma);
+#endif
 
 /* allocate physical memory */
 struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm,
@@ -70,6 +72,7 @@
 void drm_gem_cma_describe(struct drm_gem_cma_object *obj, struct seq_file *m);
 #endif
 
+#ifndef __NetBSD__             /* XXX drm prime */
 struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj);
 struct drm_gem_object *
 drm_gem_cma_prime_import_sg_table(struct drm_device *dev,
@@ -79,5 +82,6 @@
                           struct vm_area_struct *vma);
 void *drm_gem_cma_prime_vmap(struct drm_gem_object *obj);
 void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
+#endif
 
 #endif /* __DRM_GEM_CMA_HELPER_H__ */
diff -r 48d70abc0527 -r 2bdcf512ce58 sys/external/bsd/drm2/drm/drm_gem_cma_helper.c
--- a/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c    Mon Aug 27 06:56:50 2018 +0000
+++ b/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c    Mon Aug 27 06:57:00 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem_cma_helper.c,v 1.1 2017/12/26 14:53:12 jmcneill Exp $ */
+/* $NetBSD: drm_gem_cma_helper.c,v 1.2 2018/08/27 06:57:00 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_helper.c,v 1.1 2017/12/26 14:53:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_helper.c,v 1.2 2018/08/27 06:57:00 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/drm_gem_cma_helper.h>
@@ -35,7 +35,7 @@
 #include <uvm/uvm.h>
 
 struct drm_gem_cma_object *
-drm_gem_cma_create(struct drm_device *ddev, unsigned int size)
+drm_gem_cma_create(struct drm_device *ddev, size_t size)
 {
        struct drm_gem_cma_object *obj;
        int error, nsegs;