diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2013-11-27 09:46:56 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-01-07 13:37:36 +1000 |
commit | 61b365a505d625734be9ac54066fe4700672abc9 (patch) | |
tree | e2c56d6757a32426b79e37869bf553551a096738 /drivers/gpu/drm/nouveau/core/engine/device | |
parent | bdefc8cbdfc71ea73e0573dbd2d24c0a68232218 (diff) | |
download | op-kernel-dev-61b365a505d625734be9ac54066fe4700672abc9.zip op-kernel-dev-61b365a505d625734be9ac54066fe4700672abc9.tar.gz |
drm/nouveau: populate master subdev pointer only when fully constructed
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/device')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/device/base.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c index 9135b25a..dd01c6c 100644 --- a/drivers/gpu/drm/nouveau/core/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/core/engine/device/base.c @@ -268,6 +268,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent, if (ret) return ret; + device->subdev[i] = devobj->subdev[i]; + /* note: can't init *any* subdevs until devinit has been run * due to not knowing exactly what the vbios init tables will * mess with. devinit also can't be run until all of its |