drm/arm: hdlcd: Set the CRTC's port before binding the encoder.

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>

diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index 345c8357b273656c2aac475fb252401d2405b299..d3da87fbd85a57ff199881fcb12b8afd93434025 100644 (file)
--- 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 @@ err_register:
        }
 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);