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

video: rockchip: mpp: probe driver later if regulator is not ready

Browse Source 
The regulator may not ready when probe video driver, then the video
driver will probe failed. We need probe video driver again if
get_regulator() return -EPROBE_DEFER, so return -EPROBE_DEFER to
the probe.

Change-Id: Ibd60f0397af7e5d8ef79d05b44d40fd66722d53b
Signed-off-by: Liang Chen <cl@rock-chips.com>
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Liang Chen
2019-12-02 20:59:19 +08:00
committed by Tao Huang
parent eb5679251c
commit 25797ef9e1
2 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/video/rockchip/mpp/mpp_common.c
View File

@@ -1074,12 +1074,16 @@ int mpp_dev_probe(struct mpp_dev *mpp,
dev_err(dev, "failed to attach iommu: %ld\n",
PTR_ERR(mpp->iommu_info));
}
if (mpp->hw_ops->init)
mpp->hw_ops->init(mpp);
if (mpp->hw_ops->init) {
ret = mpp->hw_ops->init(mpp);
if (ret)
goto failed_init;
}
pm_runtime_put_sync(dev);
return 0;
return ret;
failed_init:
pm_runtime_put_sync(dev);
failed:
destroy_workqueue(mpp->workq);
device_init_wakeup(dev, false);

45
drivers/video/rockchip/mpp/mpp_rkvdec.c
View File

@@ -1120,13 +1120,33 @@ static int rkvdec_devfreq_init(struct mpp_dev *mpp)
int ret = 0;
struct rkvdec_dev *dec = to_rkvdec_dev(mpp);
dec->parent_devfreq = devfreq_get_devfreq_by_phandle(mpp->dev, 0);
if (IS_ERR_OR_NULL(dec->parent_devfreq)) {
ret = PTR_ERR(dec->parent_devfreq);
if (ret == -EPROBE_DEFER) {
dev_warn(mpp->dev, "parent devfreq is not ready, retry\n");
return ret;
}
} else {
dec->devfreq_nb.notifier_call = devfreq_notifier_call;
devm_devfreq_register_notifier(mpp->dev,
dec->parent_devfreq,
&dec->devfreq_nb,
DEVFREQ_TRANSITION_NOTIFIER);
}
dec->vdd = devm_regulator_get_optional(mpp->dev, "vcodec");
if (IS_ERR_OR_NULL(dec->vdd)) {
dev_warn(mpp->dev, "no regulator for %s\n",
dev_name(mpp->dev));
dec->vdd = NULL;
ret = -EINVAL;
goto done;
ret = PTR_ERR(dec->vdd);
if (ret == -EPROBE_DEFER) {
dev_warn(mpp->dev, "vcodec regulator not ready, retry\n");
return ret;
}
dev_warn(mpp->dev, "no regulator for vcodec\n");
return 0;
} else {
struct devfreq_dev_status *stat;
@@ -1153,19 +1173,6 @@ static int rkvdec_devfreq_init(struct mpp_dev *mpp)
goto done;
}
dec->parent_devfreq = devfreq_get_devfreq_by_phandle(mpp->dev, 0);
if (IS_ERR_OR_NULL(dec->parent_devfreq)) {
dev_warn(mpp->dev, "parent devfreq is error\n");
dec->parent_devfreq = NULL;
ret = -EINVAL;
goto done;
} else {
dec->devfreq_nb.notifier_call = devfreq_notifier_call;
devm_devfreq_register_notifier(mpp->dev,
dec->parent_devfreq,
&dec->devfreq_nb,
DEVFREQ_TRANSITION_NOTIFIER);
}
/* power simplle init */
ret = power_model_simple_init(mpp);
if (!ret && dec->devfreq) {
@@ -1528,7 +1535,7 @@ static int rkvdec_probe(struct platform_device *pdev)
ret = mpp_dev_probe(mpp, pdev);
if (ret) {
dev_err(dev, "probe sub driver failed\n");
return -EINVAL;
return ret;
}
ret = devm_request_threaded_irq(dev, mpp->irq,