redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/nouveau/device: enable proper constructor/destructor

Browse source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2013-04-25 11:35:18 +10:00
parent 9aecbada75
commit 066a5d0938
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/gpu/drm/nouveau/core/engine/device/base.c
View file

@ -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 static void
nouveau_device_dtor(struct nouveau_object *object) nouveau_device_dtor(struct nouveau_object *object)
{ {
@ -439,6 +453,8 @@ nouveau_device_oclass = {
.handle = NV_ENGINE(DEVICE, 0x00), .handle = NV_ENGINE(DEVICE, 0x00),
.ofuncs = &(struct nouveau_ofuncs) { .ofuncs = &(struct nouveau_ofuncs) {
.dtor = nouveau_device_dtor, .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) if (ret)
goto done; goto done;
atomic_set(&nv_object(device)->usecount, 2);
device->pdev = pdev; device->pdev = pdev;
device->handle = name; device->handle = name;
device->cfgopt = cfg; device->cfgopt = cfg;