Unverified Commit 0dba2ca1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9807 drm: zynqmp_dpsub: Always register bridge 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KTLBN5HIAVCA2IUAD3WOLQEZZQO4CXY7/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA7YJM 
 
Link:https://gitee.com/openeuler/kernel/pulls/9807

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e3cb4359 9a3db6a3

drivers/gpu/drm/xlnx/zynqmp_dpsub.c

+3 −4
Original line number Diff line number Diff line
@@ -256,12 +256,12 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev) 
	if (ret)

		goto err_dp;



	drm_bridge_add(dpsub->bridge);



	if (dpsub->dma_enabled) {

		ret = zynqmp_dpsub_drm_init(dpsub);

		if (ret)

			goto err_disp;

	} else {

		drm_bridge_add(dpsub->bridge);

	}



	dev_info(&pdev->dev, "ZynqMP DisplayPort Subsystem driver probed");
@@ -288,9 +288,8 @@ static void zynqmp_dpsub_remove(struct platform_device *pdev) 


	if (dpsub->drm)

		zynqmp_dpsub_drm_cleanup(dpsub);

	else

		drm_bridge_remove(dpsub->bridge);



	drm_bridge_remove(dpsub->bridge);

	zynqmp_disp_remove(dpsub);

	zynqmp_dp_remove(dpsub);