| Message ID | 20170606151605.31804-1-Liviu.Dudau@arm.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Jun 06, 2017 at 04:16:05PM +0100, Liviu Dudau wrote: > The component-based encoder(s) used by HDLCD expect the CRTC port > to be set before binding in order to find the right endpoint. > Without this patch, the TDA19988 encoder driver prints a warning > "Falling back to first CRTC". > > Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> > --- > drivers/gpu/drm/arm/hdlcd_drv.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c > index 345c8357b273..d3da87fbd85a 100644 > --- a/drivers/gpu/drm/arm/hdlcd_drv.c > +++ b/drivers/gpu/drm/arm/hdlcd_drv.c > @@ -297,6 +297,9 @@ static int hdlcd_drm_bind(struct device *dev) > if (ret) > goto err_free; > > + /* Set the CRTC's port so that the encoder component can find it */ > + hdlcd->crtc.port = of_graph_get_port_by_id(dev->of_node, 0); > + > ret = component_bind_all(dev, drm); > if (ret) { > DRM_ERROR("Failed to bind all components\n"); > @@ -340,11 +343,14 @@ static int hdlcd_drm_bind(struct device *dev) > } > err_fbdev: > drm_kms_helper_poll_fini(drm); > + drm_vblank_cleanup(drm); You're resurrecting dead code here. I'll do a fixup patch so I can finally unload my drm_vblank_cleanup. -Daniel > err_vblank: > pm_runtime_disable(drm->dev); > err_pm_active: > component_unbind_all(dev, drm); > err_unload: > + of_node_put(hdlcd->crtc.port); > + hdlcd->crtc.port = NULL; > drm_irq_uninstall(drm); > of_reserved_mem_device_release(drm->dev); > err_free: > @@ -367,6 +373,9 @@ static void hdlcd_drm_unbind(struct device *dev) > } > drm_kms_helper_poll_fini(drm); > component_unbind_all(dev, drm); > + of_node_put(hdlcd->crtc.port); > + hdlcd->crtc.port = NULL; > + drm_vblank_cleanup(drm); > pm_runtime_get_sync(drm->dev); > drm_irq_uninstall(drm); > pm_runtime_put_sync(drm->dev); > -- > 2.13.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index 345c8357b273..d3da87fbd85a 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -297,6 +297,9 @@ static int hdlcd_drm_bind(struct device *dev) if (ret) goto err_free; + /* Set the CRTC's port so that the encoder component can find it */ + hdlcd->crtc.port = of_graph_get_port_by_id(dev->of_node, 0); + ret = component_bind_all(dev, drm); if (ret) { DRM_ERROR("Failed to bind all components\n"); @@ -340,11 +343,14 @@ static int hdlcd_drm_bind(struct device *dev) } err_fbdev: drm_kms_helper_poll_fini(drm); + drm_vblank_cleanup(drm); err_vblank: pm_runtime_disable(drm->dev); err_pm_active: component_unbind_all(dev, drm); err_unload: + of_node_put(hdlcd->crtc.port); + hdlcd->crtc.port = NULL; drm_irq_uninstall(drm); of_reserved_mem_device_release(drm->dev); err_free: @@ -367,6 +373,9 @@ static void hdlcd_drm_unbind(struct device *dev) } drm_kms_helper_poll_fini(drm); component_unbind_all(dev, drm); + of_node_put(hdlcd->crtc.port); + hdlcd->crtc.port = NULL; + drm_vblank_cleanup(drm); pm_runtime_get_sync(drm->dev); drm_irq_uninstall(drm); pm_runtime_put_sync(drm->dev);
The component-based encoder(s) used by HDLCD expect the CRTC port to be set before binding in order to find the right endpoint. Without this patch, the TDA19988 encoder driver prints a warning "Falling back to first CRTC". Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> --- drivers/gpu/drm/arm/hdlcd_drv.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.13.0