drm/arm: mali-dp: Set crtc.port to the port instead of the endpoint

The CRTC's port pointer was being set to the endpoint node instead of
the port. Fix that, and hold a reference on the port node.

Signed-off-by: Brian Starkey <brian.starkey@arm.com>
Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1469549725-19577-1-git-send-email-brian.starkey@arm.com

diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index e5b44e92f8cf2355bcce1b6e56ad9a98e9f7ad7b..4e61ea508b4e591965e3bf586a75f16272205cf4 100644 (file)
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -257,6 +257,7 @@ static int malidp_bind(struct device *dev)
 {
        struct resource *res;
        struct drm_device *drm;
+       struct device_node *ep;
        struct malidp_drm *malidp;
        struct malidp_hw_device *hwdev;
        struct platform_device *pdev = to_platform_device(dev);
@@ -360,11 +361,12 @@ static int malidp_bind(struct device *dev)
                goto register_fail;
 
        /* Set the CRTC's port so that the encoder component can find it */
-       malidp->crtc.port = of_graph_get_next_endpoint(dev->of_node, NULL);
+       ep = of_graph_get_next_endpoint(dev->of_node, NULL);
+       if (!ep)
+               goto port_fail;
+       malidp->crtc.port = of_get_next_parent(ep);
 
        ret = component_bind_all(dev, drm);
-       of_node_put(malidp->crtc.port);
-
        if (ret) {
                DRM_ERROR("Failed to bind all components\n");
                goto bind_fail;
@@ -402,6 +404,9 @@ vblank_fail:
 irq_init_fail:
        component_unbind_all(dev, drm);
 bind_fail:
+       of_node_put(malidp->crtc.port);
+       malidp->crtc.port = NULL;
+port_fail:
        drm_dev_unregister(drm);
 register_fail:
        malidp_de_planes_destroy(drm);
@@ -435,6 +440,8 @@ static void malidp_unbind(struct device *dev)
        malidp_de_irq_fini(drm);
        drm_vblank_cleanup(drm);
        component_unbind_all(dev, drm);
+       of_node_put(malidp->crtc.port);
+       malidp->crtc.port = NULL;
        drm_dev_unregister(drm);
        malidp_de_planes_destroy(drm);
        drm_mode_config_cleanup(drm);