diff --git a/[refs] b/[refs]
index 028b3bf93fe0..a9759da1e844 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9aecbada751e6343e47cbefade718e571a8ecbbc
+refs/heads/master: 066a5d0938c64bec665866b145d8538d9f96bcda
diff --git a/trunk/drivers/gpu/drm/nouveau/core/engine/device/base.c b/trunk/drivers/gpu/drm/nouveau/core/engine/device/base.c
index 30723ee8114c..497d5f60a195 100644
--- a/trunk/drivers/gpu/drm/nouveau/core/engine/device/base.c
+++ b/trunk/drivers/gpu/drm/nouveau/core/engine/device/base.c
@@ -419,6 +419,20 @@ nouveau_device_sclass[] = {
 	{}
 };
 
+static int
+nouveau_device_fini(struct nouveau_object *object, bool suspend)
+{
+	struct nouveau_device *device = (void *)object;
+	return nouveau_subdev_fini(&device->base, suspend);
+}
+
+static int
+nouveau_device_init(struct nouveau_object *object)
+{
+	struct nouveau_device *device = (void *)object;
+	return nouveau_subdev_init(&device->base);
+}
+
 static void
 nouveau_device_dtor(struct nouveau_object *object)
 {
@@ -439,6 +453,8 @@ nouveau_device_oclass = {
 	.handle = NV_ENGINE(DEVICE, 0x00),
 	.ofuncs = &(struct nouveau_ofuncs) {
 		.dtor = nouveau_device_dtor,
+		.init = nouveau_device_init,
+		.fini = nouveau_device_fini,
 	},
 };
 
@@ -462,7 +478,6 @@ nouveau_device_create_(struct pci_dev *pdev, u64 name, const char *sname,
 	if (ret)
 		goto done;
 
-	atomic_set(&nv_object(device)->usecount, 2);
 	device->pdev = pdev;
 	device->handle = name;
 	device->cfgopt = cfg;