Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:38:42 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_nv84_fence.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device:
nouveau_nvkm_engine_device_base.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c:
nouveau_nvkm_subdev_i2c_aux.c nouveau_nvkm_subdev_i2c_bus.c
nouveau_nvkm_subdev_i2c_pad.c
Log Message:
Fix up some linux mutex init/destroy.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_aux.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_bus.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_pad.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/nouveau_nv84_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c:1.4 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c Mon Aug 27 07:38:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nv84_fence.c,v 1.4 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: nouveau_nv84_fence.c,v 1.5 2018/08/27 07:38:42 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nv84_fence.c,v 1.4 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nv84_fence.c,v 1.5 2018/08/27 07:38:42 riastradh Exp $");
#include "nouveau_drm.h"
#include "nouveau_dma.h"
@@ -217,6 +217,11 @@ nv84_fence_destroy(struct nouveau_drm *d
nouveau_bo_unpin(priv->bo);
nouveau_bo_ref(NULL, &priv->bo);
drm->fence = NULL;
+#ifdef __NetBSD__
+ linux_mutex_destroy(&priv->mutex);
+#else
+ mutex_destroy(&priv->mutex);
+#endif
kfree(priv);
}
@@ -242,7 +247,11 @@ nv84_fence_create(struct nouveau_drm *dr
priv->base.context_base = fence_context_alloc(priv->base.contexts);
priv->base.uevent = true;
+#ifdef __NetBSD__
+ linux_mutex_init(&priv->mutex);
+#else
mutex_init(&priv->mutex);
+#endif
/* Use VRAM if there is any ; otherwise fallback to system memory */
domain = drm->device.info.ram_size != 0 ? TTM_PL_FLAG_VRAM :
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.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.2 Mon Aug 27 04:58:31 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c Mon Aug 27 07:38:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.2 2018/08/27 04:58:31 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.3 2018/08/27 07:38:42 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.2 2018/08/27 04:58:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.3 2018/08/27 07:38:42 riastradh Exp $");
#include "priv.h"
#include "acpi.h"
@@ -2303,6 +2303,12 @@ nvkm_device_del(struct nvkm_device **pde
nvkm_subdev_del(&subdev);
}
+#ifdef __NetBSD__
+ linux_mutex_destroy(&device->mutex);
+#else
+ mutex_destroy(&device->mutex);
+#endif
+
nvkm_event_fini(&device->event);
#ifdef __NetBSD__
@@ -2573,7 +2579,11 @@ nvkm_device_ctor(const struct nvkm_devic
#endif
}
+#ifdef __NetBSD__
+ linux_mutex_init(&device->mutex);
+#else
mutex_init(&device->mutex);
+#endif
for (i = 0; i < NVKM_SUBDEV_NR; i++) {
#define _(s,m) case s: \
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_aux.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_aux.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_aux.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_aux.c:1.2 Mon Aug 27 04:58:34 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_aux.c Mon Aug 27 07:38:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_i2c_aux.c,v 1.2 2018/08/27 04:58:34 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_i2c_aux.c,v 1.3 2018/08/27 07:38:42 riastradh Exp $ */
/*
* Copyright 2009 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_i2c_aux.c,v 1.2 2018/08/27 04:58:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_i2c_aux.c,v 1.3 2018/08/27 07:38:42 riastradh Exp $");
#include "aux.h"
#include "pad.h"
@@ -141,6 +141,11 @@ nvkm_i2c_aux_del(struct nvkm_i2c_aux **p
AUX_TRACE(aux, "dtor");
list_del(&aux->head);
i2c_del_adapter(&aux->i2c);
+#ifdef __NetBSD__
+ linux_mutex_destroy(&aux->mutex);
+#else
+ mutex_destroy(&aux->mutex);
+#endif
kfree(*paux);
*paux = NULL;
}
@@ -156,7 +161,11 @@ nvkm_i2c_aux_ctor(const struct nvkm_i2c_
aux->func = func;
aux->pad = pad;
aux->id = id;
+#ifdef __NetBSD__
+ linux_mutex_init(&aux->mutex);
+#else
mutex_init(&aux->mutex);
+#endif
list_add_tail(&aux->head, &pad->i2c->aux);
AUX_TRACE(aux, "ctor");
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_bus.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_bus.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_bus.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_bus.c:1.2 Mon Aug 27 04:58:34 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_bus.c Mon Aug 27 07:38:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_i2c_bus.c,v 1.2 2018/08/27 04:58:34 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_i2c_bus.c,v 1.3 2018/08/27 07:38:42 riastradh Exp $ */
/*
* Copyright 2015 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs <[email protected]>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_i2c_bus.c,v 1.2 2018/08/27 04:58:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_i2c_bus.c,v 1.3 2018/08/27 07:38:42 riastradh Exp $");
#include "bus.h"
#include "pad.h"
@@ -184,6 +184,11 @@ nvkm_i2c_bus_del(struct nvkm_i2c_bus **p
BUS_TRACE(bus, "dtor");
list_del(&bus->head);
i2c_del_adapter(&bus->i2c);
+#ifdef __NetBSD__
+ linux_mutex_destroy(&bus->mutex);
+#else
+ mutex_destroy(&bus->mutex);
+#endif
kfree(bus->i2c.algo_data);
kfree(*pbus);
*pbus = NULL;
@@ -207,7 +212,11 @@ nvkm_i2c_bus_ctor(const struct nvkm_i2c_
bus->func = func;
bus->pad = pad;
bus->id = id;
+#ifdef __NetBSD__
+ linux_mutex_init(&bus->mutex);
+#else
mutex_init(&bus->mutex);
+#endif
list_add_tail(&bus->head, &pad->i2c->bus);
BUS_TRACE(bus, "ctor");
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_pad.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_pad.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_pad.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_pad.c:1.2 Mon Aug 27 04:58:34 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/i2c/nouveau_nvkm_subdev_i2c_pad.c Mon Aug 27 07:38:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_i2c_pad.c,v 1.2 2018/08/27 04:58:34 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_i2c_pad.c,v 1.3 2018/08/27 07:38:42 riastradh Exp $ */
/*
* Copyright 2015 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs <[email protected]>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_i2c_pad.c,v 1.2 2018/08/27 04:58:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_i2c_pad.c,v 1.3 2018/08/27 07:38:42 riastradh Exp $");
#include "pad.h"
@@ -92,6 +92,11 @@ nvkm_i2c_pad_del(struct nvkm_i2c_pad **p
if (pad) {
PAD_TRACE(pad, "dtor");
list_del(&pad->head);
+#ifdef __NetBSD__
+ linux_mutex_destroy(&pad->mutex);
+#else
+ mutex_destroy(&pad->mutex);
+#endif
kfree(pad);
pad = NULL;
}
@@ -105,7 +110,11 @@ nvkm_i2c_pad_ctor(const struct nvkm_i2c_
pad->i2c = i2c;
pad->id = id;
pad->mode = NVKM_I2C_PAD_OFF;
+#ifdef __NetBSD__
+ linux_mutex_init(&pad->mutex);
+#else
mutex_init(&pad->mutex);
+#endif
list_add_tail(&pad->head, &i2c->pad);
PAD_TRACE(pad, "ctor");
}
