Module Name: src
Committed By: riastradh
Date: Mon Aug 27 13:43:52 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core: device.h
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device:
nouveau_nvkm_engine_device_base.c
src/sys/external/bsd/drm2/nouveau: nouveau_module.c
Log Message:
Rename nouveau_devices_init/fini -> nvkm_devices_init/fini.
Matches newer upstream naming conventions better.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/nouveau/nouveau_module.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/nouveau/include/nvkm/core/device.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h:1.4 Mon Aug 27 07:32:31 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h Mon Aug 27 13:43:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.4 2018/08/27 07:32:31 riastradh Exp $ */
+/* $NetBSD: device.h,v 1.5 2018/08/27 13:43:52 riastradh Exp $ */
#ifndef __NVKM_DEVICE_H__
#define __NVKM_DEVICE_H__
@@ -223,8 +223,8 @@ struct nvkm_device *nvkm_device_find(u64
int nvkm_device_list(u64 *name, int size);
#ifdef __NetBSD__
-void nouveau_devices_init(void);
-void nouveau_devices_fini(void);
+void nvkm_devices_init(void);
+void nvkm_devices_fini(void);
#endif
/* privileged register interface accessor macros */
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.5 Mon Aug 27 07:39:33 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c Mon Aug 27 13:43:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.5 2018/08/27 07:39:33 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.6 2018/08/27 13:43:52 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.5 2018/08/27 07:39:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.6 2018/08/27 13:43:52 riastradh Exp $");
#include "priv.h"
#include "acpi.h"
@@ -39,14 +39,14 @@ static struct mutex nv_devices_mutex;
static struct list_head nv_devices = LIST_HEAD_INIT(nv_devices);
void
-nouveau_devices_init(void)
+nvkm_devices_init(void)
{
linux_mutex_init(&nv_devices_mutex);
}
void
-nouveau_devices_fini(void)
+nvkm_devices_fini(void)
{
linux_mutex_destroy(&nv_devices_mutex);
Index: src/sys/external/bsd/drm2/nouveau/nouveau_module.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.5 src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.6
--- src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.5 Mon Aug 27 06:41:25 2018
+++ src/sys/external/bsd/drm2/nouveau/nouveau_module.c Mon Aug 27 13:43:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_module.c,v 1.5 2018/08/27 06:41:25 riastradh Exp $ */
+/* $NetBSD: nouveau_module.c,v 1.6 2018/08/27 13:43:52 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_module.c,v 1.5 2018/08/27 06:41:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_module.c,v 1.6 2018/08/27 13:43:52 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -54,7 +54,7 @@ extern struct drm_driver *const nouveau_
static int
nouveau_init(void)
{
- nouveau_devices_init();
+ nvkm_devices_init();
drm_sysctl_init(&nouveau_def);
return 0;
@@ -65,7 +65,7 @@ nouveau_fini(void)
{
drm_sysctl_fini(&nouveau_def);
- nouveau_devices_fini();
+ nvkm_devices_fini();
}
static int
