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

Commit a805ce68 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'mediatek-drm-fixes-4.20' of... 

Merge branch 'mediatek-drm-fixes-4.20' of https://github.com/ckhu-mediatek/linux.git-tags

 into drm-fixes

Single bridge attachment fix.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: CK Hu <ck.hu@mediatek.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1544407975.18825.3.camel@mtksdaap41
parents 28adac6f a0071bc4

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)