shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: dw_hdmi: Fix other platforms using RK3588 unique resources

Browse Source 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I96b59ac25697e4c1b91ce3eb5109dcb52a639346
This commit is contained in:
Algea Cao
2022-01-11 16:50:56 +08:00
committed by Tao Huang
parent 90f39c9ead
commit 48fe186846
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
View File

@@ -1283,10 +1283,12 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
return PTR_ERR(hdmi->regmap);
}
hdmi->vo1_regmap = syscon_regmap_lookup_by_phandle(np, "rockchip,vo1_grf");
if (IS_ERR(hdmi->vo1_regmap)) {
DRM_DEV_ERROR(hdmi->dev, "Unable to get rockchip,vo1_grf\n");
return PTR_ERR(hdmi->vo1_regmap);
if (hdmi->is_hdmi_qp) {
hdmi->vo1_regmap = syscon_regmap_lookup_by_phandle(np, "rockchip,vo1_grf");
if (IS_ERR(hdmi->vo1_regmap)) {
DRM_DEV_ERROR(hdmi->dev, "Unable to get rockchip,vo1_grf\n");
return PTR_ERR(hdmi->vo1_regmap);
}
}
hdmi->phyref_clk = devm_clk_get(hdmi->dev, "vpll");
@@ -3125,9 +3127,11 @@ static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master,
{
struct rockchip_hdmi *hdmi = dev_get_drvdata(dev);
cancel_delayed_work(&hdmi->work);
flush_workqueue(hdmi->workqueue);
destroy_workqueue(hdmi->workqueue);
if (hdmi->is_hdmi_qp) {
cancel_delayed_work(&hdmi->work);
flush_workqueue(hdmi->workqueue);
destroy_workqueue(hdmi->workqueue);
}
if (hdmi->sub_dev.connector)
rockchip_drm_unregister_sub_dev(&hdmi->sub_dev);
@@ -3165,9 +3169,14 @@ static void dw_hdmi_rockchip_shutdown(struct platform_device *pdev)
if (!hdmi)
return;
cancel_delayed_work(&hdmi->work);
flush_workqueue(hdmi->workqueue);
dw_hdmi_suspend(hdmi->hdmi);
if (hdmi->is_hdmi_qp) {
cancel_delayed_work(&hdmi->work);
flush_workqueue(hdmi->workqueue);
dw_hdmi_qp_suspend(hdmi->dev, hdmi->hdmi_qp);
} else {
dw_hdmi_suspend(hdmi->hdmi);
}
pm_runtime_put_sync(&pdev->dev);
}