Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:57:00 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_gem_cma_helper.h
src/sys/external/bsd/drm2/drm: drm_gem_cma_helper.c
Log Message:
Fix up drm_gem_cma_helper.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.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/include/drm/drm_gem_cma_helper.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h:1.4
--- src/sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h:1.3 Mon Aug 27 04:58:37 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_gem_cma_helper.h Mon Aug 27 06:57:00 2018
@@ -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 @@ int drm_gem_cma_dumb_map_offset(struct d
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 @@ extern const struct vm_operations_struct
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 @@ int drm_gem_cma_prime_mmap(struct drm_ge
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__ */
Index: src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c
diff -u src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.1 src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.2
--- src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.1 Tue Dec 26 14:53:12 2017
+++ src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c Mon Aug 27 06:57:00 2018
@@ -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 <[email protected]>
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_
#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;
