]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/nouveau/drm/nouveau: tegra: Call nouveau_drm_device_init()
authorThierry Reding <treding@nvidia.com>
Fri, 23 Nov 2018 12:11:51 +0000 (13:11 +0100)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 11 Dec 2018 04:55:28 +0000 (14:55 +1000)
As part of commit cfea88a4d866 ("drm/nouveau: Start using new drm_dev
initialization helpers"), the initialization of the Nouveau DRM device
was reworked and along the way the platform driver initialization was
left incomplete. Add a call to nouveau_drm_device_init() to make sure
all of the structures are properly initialized.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_drm.c

index 2b2baf6e0e0d6bbde2aadefd0a16e55aaadf3736..d2928d43f29a43d772729ef68036b426f861047d 100644 (file)
@@ -1171,10 +1171,16 @@ nouveau_platform_device_create(const struct nvkm_device_tegra_func *func,
                goto err_free;
        }
 
+       err = nouveau_drm_device_init(drm);
+       if (err)
+               goto err_put;
+
        platform_set_drvdata(pdev, drm);
 
        return drm;
 
+err_put:
+       drm_dev_put(drm);
 err_free:
        nvkm_device_del(pdevice);