Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Nicolas Boichat <drinkcat@chromium.org>
Signed-off-by: CK Hu <ck.hu@mediatek.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>

authored by

Nicolas Boichat and committed by
CK Hu
a0071bc4 65102238

+7 -4
+7 -4
drivers/gpu/drm/mediatek/mtk_dsi.c
··· 818 818 dsi->encoder.possible_crtcs = 1; 819 819 820 820 /* If there's a bridge, attach to it and let it create the connector */ 821 - ret = drm_bridge_attach(&dsi->encoder, dsi->bridge, NULL); 822 - if (ret) { 823 - DRM_ERROR("Failed to attach bridge to drm\n"); 824 - 821 + if (dsi->bridge) { 822 + ret = drm_bridge_attach(&dsi->encoder, dsi->bridge, NULL); 823 + if (ret) { 824 + DRM_ERROR("Failed to attach bridge to drm\n"); 825 + goto err_encoder_cleanup; 826 + } 827 + } else { 825 828 /* Otherwise create our own connector and attach to a panel */ 826 829 ret = mtk_dsi_create_connector(drm, dsi); 827 830 if (ret)