github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

video: rockchip: mpp: fix issue for px30 switch grf workaround

Browse Source 
if iommu had paged, then skip the enable process.

Change-Id: I07ae8ca8e0836472f79dcabf7b14f5fbba4b8870
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Ding Wei 2020-05-14 09:27:06 +08:00 committed by Tao Huang
parent 2d16c73564
commit a496199ca4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,11 +477,10 @@ int mpp_iommu_enable(struct mpp_rk_iommu *iommu)
{
int i;
/* iommu should be paging disable */
if (mpp_iommu_is_paged(iommu)) {
mpp_err("iommu disable failed\n");
return -ENOMEM;
}
/* check iommu whether is paged */
iommu->is_paged = mpp_iommu_is_paged(iommu);
if (iommu->is_paged)
return 0;
/* enable stall */
for (i = 0; i < iommu->mmu_num; i++)
@ -520,7 +519,8 @@ int mpp_iommu_enable(struct mpp_rk_iommu *iommu)
/* iommu should be paging enable */
iommu->is_paged = mpp_iommu_is_paged(iommu);
if (!iommu->is_paged) {
mpp_err("iommu enable failed\n");
mpp_err("iommu->base_addr=%08x enable failed\n",
iommu->base_addr[0]);
return -EINVAL;
}