github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 15:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

video: rockchip: mpp: Fix combo hardware issue

Browse Source 
With multi core patch it will be lack of core id at old combo
hardware probe process.

The error log is shown below on device probe:
mpp_vepu2 ff650000.vepu: can not attach device with same id 0

And also kernel crach on mpp library init.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I92ea5fc3575dad9236878235a396d02da7a3fba5
This commit is contained in:
Herman Chen 2022-02-15 15:44:36 +08:00 committed by Tao Huang
parent 33af23ddcf
commit 7eb71ee55c
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/rockchip/mpp/mpp_vdpu1.c
View File

@ -802,6 +802,8 @@ static int vdpu_probe(struct platform_device *pdev)
match = of_match_node(mpp_vdpu1_dt_match, pdev->dev.of_node);
if (match)
mpp->var = (struct mpp_dev_var *)match->data;
mpp->core_id = of_alias_get_id(pdev->dev.of_node, "vdpu");
}
ret = mpp_dev_probe(mpp, pdev);

2
drivers/video/rockchip/mpp/mpp_vdpu2.c
View File

@ -695,6 +695,8 @@ static int vdpu_probe(struct platform_device *pdev)
pdev->dev.of_node);
if (match)
mpp->var = (struct mpp_dev_var *)match->data;
mpp->core_id = of_alias_get_id(pdev->dev.of_node, "vdpu");
}
ret = mpp_dev_probe(mpp, pdev);

2
drivers/video/rockchip/mpp/mpp_vepu1.c
View File

@ -728,6 +728,8 @@ static int vepu_probe(struct platform_device *pdev)
match = of_match_node(mpp_vepu1_dt_match, pdev->dev.of_node);
if (match)
mpp->var = (struct mpp_dev_var *)match->data;
mpp->core_id = of_alias_get_id(pdev->dev.of_node, "vepu");
}
ret = mpp_dev_probe(mpp, pdev);

2
drivers/video/rockchip/mpp/mpp_vepu2.c
View File

@ -1053,6 +1053,8 @@ static int vepu_probe_default(struct platform_device *pdev)
match = of_match_node(mpp_vepu2_dt_match, pdev->dev.of_node);
if (match)
mpp->var = (struct mpp_dev_var *)match->data;
mpp->core_id = of_alias_get_id(pdev->dev.of_node, "vepu");
}
ret = mpp_dev_probe(mpp, pdev);