diff mbox

[v3,11/13] drm: Set on-chip bridges' encoder type

Message ID 1480410283-28698-12-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive)
State Not Applicable
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Laurent Pinchart Nov. 29, 2016, 9:04 a.m. UTC
Initialize the new drm_bridge::encoder_type field to the right value for
all bridges that model on-SoC IP cores.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/gpu/drm/exynos/exynos_drm_mic.c | 2 ++
 drivers/gpu/drm/mediatek/mtk_hdmi.c     | 2 ++
 drivers/gpu/drm/sti/sti_dvo.c           | 2 ++
 3 files changed, 6 insertions(+)

Comments

Vincent Abriou Nov. 30, 2016, 3:28 p.m. UTC | #1
On 11/29/2016 10:04 AM, Laurent Pinchart wrote:
> Initialize the new drm_bridge::encoder_type field to the right value for
> all bridges that model on-SoC IP cores.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  drivers/gpu/drm/exynos/exynos_drm_mic.c | 2 ++
>  drivers/gpu/drm/mediatek/mtk_hdmi.c     | 2 ++
>  drivers/gpu/drm/sti/sti_dvo.c           | 2 ++
>  3 files changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_mic.c b/drivers/gpu/drm/exynos/exynos_drm_mic.c
> index a0def0be6d65..7175ecda36e8 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_mic.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_mic.c
> @@ -390,6 +390,8 @@ static int exynos_mic_bind(struct device *dev, struct device *master,
>  	mic->bridge.funcs = &mic_bridge_funcs;
>  	mic->bridge.of_node = dev->of_node;
>  	mic->bridge.driver_private = mic;
> +	mic->bridge.encoder_type = DRM_MODE_ENCODER_DSI;
> +
>  	ret = drm_bridge_add(&mic->bridge);
>  	if (ret)
>  		DRM_ERROR("mic: Failed to add MIC to the global bridge list\n");
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index 5ca1b0fbf937..bb5cf594c721 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -1712,6 +1712,8 @@ static int mtk_drm_hdmi_probe(struct platform_device *pdev)
>
>  	hdmi->bridge.funcs = &mtk_hdmi_bridge_funcs;
>  	hdmi->bridge.of_node = pdev->dev.of_node;
> +	hdmi->bridge.encoder_type = DRM_MODE_ENCODER_TMDS;
> +
>  	ret = drm_bridge_add(&hdmi->bridge);
>  	if (ret) {
>  		dev_err(dev, "failed to add bridge, ret = %d\n", ret);
> diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
> index 411dc6ec976e..8912c932078f 100644
> --- a/drivers/gpu/drm/sti/sti_dvo.c
> +++ b/drivers/gpu/drm/sti/sti_dvo.c
> @@ -472,6 +472,8 @@ static int sti_dvo_bind(struct device *dev, struct device *master, void *data)
>  	bridge->driver_private = dvo;
>  	bridge->funcs = &sti_dvo_bridge_funcs;
>  	bridge->of_node = dvo->dev.of_node;
> +	bridge->encoder_type = DRM_MODE_ENCODER_LVDS;
> +
>  	err = drm_bridge_add(bridge);
>  	if (err) {
>  		DRM_ERROR("Failed to add bridge\n");

For the sti dvo part:
Acked-by: Vincent Abriou <vincent.abriou@st.com>

Vincent
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/exynos/exynos_drm_mic.c b/drivers/gpu/drm/exynos/exynos_drm_mic.c
index a0def0be6d65..7175ecda36e8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_mic.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_mic.c
@@ -390,6 +390,8 @@  static int exynos_mic_bind(struct device *dev, struct device *master,
 	mic->bridge.funcs = &mic_bridge_funcs;
 	mic->bridge.of_node = dev->of_node;
 	mic->bridge.driver_private = mic;
+	mic->bridge.encoder_type = DRM_MODE_ENCODER_DSI;
+
 	ret = drm_bridge_add(&mic->bridge);
 	if (ret)
 		DRM_ERROR("mic: Failed to add MIC to the global bridge list\n");
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 5ca1b0fbf937..bb5cf594c721 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1712,6 +1712,8 @@  static int mtk_drm_hdmi_probe(struct platform_device *pdev)
 
 	hdmi->bridge.funcs = &mtk_hdmi_bridge_funcs;
 	hdmi->bridge.of_node = pdev->dev.of_node;
+	hdmi->bridge.encoder_type = DRM_MODE_ENCODER_TMDS;
+
 	ret = drm_bridge_add(&hdmi->bridge);
 	if (ret) {
 		dev_err(dev, "failed to add bridge, ret = %d\n", ret);
diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index 411dc6ec976e..8912c932078f 100644
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -472,6 +472,8 @@  static int sti_dvo_bind(struct device *dev, struct device *master, void *data)
 	bridge->driver_private = dvo;
 	bridge->funcs = &sti_dvo_bridge_funcs;
 	bridge->of_node = dvo->dev.of_node;
+	bridge->encoder_type = DRM_MODE_ENCODER_LVDS;
+
 	err = drm_bridge_add(bridge);
 	if (err) {
 		DRM_ERROR("Failed to add bridge\n");