| Message ID | 20181123121151.17766-1-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/nouveau: tegra: Call nouveau_drm_device_init() | expand |
Looks good to me Reviewed-by: Lyude Paul <lyude@redhat.com> On Fri, 2018-11-23 at 13:11 +0100, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > 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> > --- > drivers/gpu/drm/nouveau/nouveau_drm.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c > b/drivers/gpu/drm/nouveau/nouveau_drm.c > index 2b2baf6e0e0d..d2928d43f29a 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > @@ -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); >
On Fri, 2018-11-23 at 13:11 +0100, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > 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> > --- > drivers/gpu/drm/nouveau/nouveau_drm.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c > b/drivers/gpu/drm/nouveau/nouveau_drm.c > index 2b2baf6e0e0d..d2928d43f29a 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > @@ -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);
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 2b2baf6e0e0d..d2928d43f29a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -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);