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

Commit a0071bc4 authored by Nicolas Boichat's avatar Nicolas Boichat Committed by CK Hu
Browse files

drm/mediatek: Only try to attach bridge if there is one 



Even if dsi->bridge is NULL, we still try to call drm_bridge_attach,
and print out an error message, before creating the connector.

When no bridge is provided, let's skip these 2 steps and directly
create the connector.

Signed-off-by: default avatarNicolas Boichat <drinkcat@chromium.org>
Signed-off-by: default avatarCK Hu <ck.hu@mediatek.com>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
parent 65102238

drivers/gpu/drm/mediatek/mtk_dsi.c

+7 −4
Original line number Diff line number Diff line
@@ -818,10 +818,13 @@ static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi) 
	dsi->encoder.possible_crtcs = 1;



	/* If there's a bridge, attach to it and let it create the connector */

	if (dsi->bridge) {

		ret = drm_bridge_attach(&dsi->encoder, dsi->bridge, NULL);

		if (ret) {

			DRM_ERROR("Failed to attach bridge to drm\n");



			goto err_encoder_cleanup;

		}

	} else {

		/* Otherwise create our own connector and attach to a panel */

		ret = mtk_dsi_create_connector(drm, dsi);

		if (ret)