Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de5cc815 authored by Liviu Dudau's avatar Liviu Dudau
Browse files

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: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
parent 047b8e21

drivers/gpu/drm/arm/hdlcd_drv.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -297,6 +297,9 @@ static int hdlcd_drm_bind(struct device *dev) 
	if (ret)

	if (ret)

		goto err_free;

		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);

	ret = component_bind_all(dev, drm);

	if (ret) {

	if (ret) {

		DRM_ERROR("Failed to bind all components\n");

		DRM_ERROR("Failed to bind all components\n");
@@ -340,11 +343,14 @@ static int hdlcd_drm_bind(struct device *dev) 
	}

	}

err_fbdev:

err_fbdev:

	drm_kms_helper_poll_fini(drm);

	drm_kms_helper_poll_fini(drm);

	drm_vblank_cleanup(drm);

err_vblank:

err_vblank:

	pm_runtime_disable(drm->dev);

	pm_runtime_disable(drm->dev);

err_pm_active:

err_pm_active:

	component_unbind_all(dev, drm);

	component_unbind_all(dev, drm);

err_unload:

err_unload:

	of_node_put(hdlcd->crtc.port);

	hdlcd->crtc.port = NULL;

	drm_irq_uninstall(drm);

	drm_irq_uninstall(drm);

	of_reserved_mem_device_release(drm->dev);

	of_reserved_mem_device_release(drm->dev);

err_free:

err_free:
@@ -367,6 +373,9 @@ static void hdlcd_drm_unbind(struct device *dev) 
	}

	}

	drm_kms_helper_poll_fini(drm);

	drm_kms_helper_poll_fini(drm);

	component_unbind_all(dev, 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);

	pm_runtime_get_sync(drm->dev);

	drm_irq_uninstall(drm);

	drm_irq_uninstall(drm);

	pm_runtime_put_sync(drm->dev);

	pm_runtime_put_sync(drm->dev);