History

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

Single bridge attachment fix.

Dave Airlie committed 7 years ago

Commit a805ce62 parents 28adac6 a0071bc1 file · +7 −4Browse files

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t