From 066a5d0938c64bec665866b145d8538d9f96bcda Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 25 Apr 2013 11:35:18 +1000 Subject: [PATCH] drm/nouveau/device: enable proper constructor/destructor Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/core/engine/device/base.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c index 30723ee..497d5f6 100644 --- a/drivers/gpu/drm/nouveau/core/engine/device/base.c +++ b/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; -- 2.7.4