korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-25 03:55:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Brian Starkey 2016-07-26 17:15:25 +01:00 committed by Sean Paul
parent c084c8dafc
commit 3c31760e76
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/arm/malidp_drv.c
View File

@ -257,6 +257,7 @@ static int malidp_bind(struct device *dev)
{ {
struct resource *res; struct resource *res;
struct drm_device *drm; struct drm_device *drm;
struct device_node *ep;
struct malidp_drm *malidp; struct malidp_drm *malidp;
struct malidp_hw_device *hwdev; struct malidp_hw_device *hwdev;
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
@ -360,11 +361,12 @@ static int malidp_bind(struct device *dev)
goto register_fail; goto register_fail;
/* Set the CRTC's port so that the encoder component can find it */ /* 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); ret = component_bind_all(dev, drm);
of_node_put(malidp->crtc.port);
if (ret) { if (ret) {
DRM_ERROR("Failed to bind all components\n"); DRM_ERROR("Failed to bind all components\n");
goto bind_fail; goto bind_fail;
@ -402,6 +404,9 @@ vblank_fail:
irq_init_fail: irq_init_fail:
component_unbind_all(dev, drm); component_unbind_all(dev, drm);
bind_fail: bind_fail:
of_node_put(malidp->crtc.port);
malidp->crtc.port = NULL;
port_fail:
drm_dev_unregister(drm); drm_dev_unregister(drm);
register_fail: register_fail:
malidp_de_planes_destroy(drm); malidp_de_planes_destroy(drm);
@ -435,6 +440,8 @@ static void malidp_unbind(struct device *dev)
malidp_de_irq_fini(drm); malidp_de_irq_fini(drm);
drm_vblank_cleanup(drm); drm_vblank_cleanup(drm);
component_unbind_all(dev, drm); component_unbind_all(dev, drm);
of_node_put(malidp->crtc.port);
malidp->crtc.port = NULL;
drm_dev_unregister(drm); drm_dev_unregister(drm);
malidp_de_planes_destroy(drm); malidp_de_planes_destroy(drm);
drm_mode_config_cleanup(drm); drm_mode_config_cleanup(drm);