Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:02:06 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/drm: drm_scatter.c
Log Message:
drm_sg_* legacy
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drm_scatter.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/drm/drm_scatter.c
diff -u src/sys/external/bsd/drm2/drm/drm_scatter.c:1.4 src/sys/external/bsd/drm2/drm/drm_scatter.c:1.5
--- src/sys/external/bsd/drm2/drm/drm_scatter.c:1.4 Wed Feb 7 06:18:46 2018
+++ src/sys/external/bsd/drm2/drm/drm_scatter.c Mon Aug 27 07:02:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_scatter.c,v 1.4 2018/02/07 06:18:46 mrg Exp $ */
+/* $NetBSD: drm_scatter.c,v 1.5 2018/08/27 07:02:06 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.4 2018/02/07 06:18:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.5 2018/08/27 07:02:06 riastradh Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -40,13 +40,15 @@ __KERNEL_RCSID(0, "$NetBSD: drm_scatter.
#include <linux/slab.h>
#include <drm/drmP.h>
+#include <drm/drm_internal.h>
+#include "../dist/drm/drm_legacy.h"
static int drm_sg_alloc_mem(struct drm_device *, size_t,
struct drm_sg_mem **);
static void drm_sg_free_mem(struct drm_device *, struct drm_sg_mem *);
int
-drm_sg_alloc(struct drm_device *dev, void *data,
+drm_legacy_sg_alloc(struct drm_device *dev, void *data,
struct drm_file *file __unused)
{
struct drm_scatter_gather *const request = data;
@@ -88,7 +90,7 @@ drm_sg_alloc(struct drm_device *dev, voi
}
int
-drm_sg_free(struct drm_device *dev, void *data, struct drm_file *file)
+drm_legacy_sg_free(struct drm_device *dev, void *data, struct drm_file *file)
{
struct drm_scatter_gather *const request = data;
struct drm_sg_mem *sg;
