aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/tilcdc
diff options
context:
space:
mode:
authorJyri Sarha <jsarha@ti.com>2015-05-27 04:58:37 -0400
committerJyri Sarha <jsarha@ti.com>2016-02-25 09:39:46 -0500
commitd66284fba15014daacef64cfc610a249553534c6 (patch)
tree520cfc47a04b397a5c2d1ba17ce46b52483931be /drivers/gpu/drm/tilcdc
parent5895d08f6ff2175dabc373dada7d1bfa26123fc9 (diff)
drm/tilcdc: Initialize crtc->port
Initialize port device node pointer in the tilcdc crtc. Fixes "Falling back to first CRTC" warning from tda998x driver. The tda998x encoder driver calls drm_of_find_possible_crtcs() to initialize possible_crtcs of struct drm_encoder. The crtc->port needs to be initialized for drm_of_find_possible_crtcs() to work. Signed-off-by: Jyri Sarha <jsarha@ti.com> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/tilcdc')
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_crtc.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 248e3ea7568c..5f4da8c86ce2 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -124,6 +124,7 @@ static void tilcdc_crtc_destroy(struct drm_crtc *crtc)
124 124
125 tilcdc_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); 125 tilcdc_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
126 126
127 of_node_put(crtc->port);
127 drm_crtc_cleanup(crtc); 128 drm_crtc_cleanup(crtc);
128 drm_flip_work_cleanup(&tilcdc_crtc->unref_work); 129 drm_flip_work_cleanup(&tilcdc_crtc->unref_work);
129 130
@@ -749,6 +750,7 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
749 750
750struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev) 751struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev)
751{ 752{
753 struct tilcdc_drm_private *priv = dev->dev_private;
752 struct tilcdc_crtc *tilcdc_crtc; 754 struct tilcdc_crtc *tilcdc_crtc;
753 struct drm_crtc *crtc; 755 struct drm_crtc *crtc;
754 int ret; 756 int ret;
@@ -775,6 +777,24 @@ struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev)
775 777
776 drm_crtc_helper_add(crtc, &tilcdc_crtc_helper_funcs); 778 drm_crtc_helper_add(crtc, &tilcdc_crtc_helper_funcs);
777 779
780 if (priv->is_componentized) {
781 struct device_node *ports =
782 of_get_child_by_name(dev->dev->of_node, "ports");
783
784 if (ports) {
785 crtc->port = of_get_child_by_name(ports, "port");
786 of_node_put(ports);
787 } else {
788 crtc->port =
789 of_get_child_by_name(dev->dev->of_node, "port");
790 }
791 if (!crtc->port) { /* This should never happen */
792 dev_err(dev->dev, "Port node not found in %s\n",
793 dev->dev->of_node->full_name);
794 goto fail;
795 }
796 }
797
778 return crtc; 798 return crtc;
779 799
780fail: 800fail: