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

media: rockchip: ispp: replace iommu detach/attach

Browse Source 
Change-Id: I1cf46cb9cba85be418f32d218dd70452c8062d42
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2021-10-14 16:38:01 +08:00
parent 4aed134bfe
commit c75bd88eba
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/platform/rockchip/ispp/hw.c
View File

@@ -16,6 +16,7 @@
#include <linux/reset.h>
#include <media/videobuf2-dma-contig.h>
#include <media/videobuf2-dma-sg.h>
#include <soc/rockchip/rockchip_iommu.h>
#include "common.h"
#include "dev.h"
@@ -40,10 +41,6 @@ struct irqs_data {
void rkispp_soft_reset(struct rkispp_hw_dev *hw)
{
struct iommu_domain *domain = iommu_get_domain_for_dev(hw->dev);
if (domain)
iommu_detach_device(domain, hw->dev);
writel(GLB_SOFT_RST_ALL, hw->base_addr + RKISPP_CTRL_RESET);
udelay(10);
if (hw->reset) {
@@ -52,8 +49,12 @@ void rkispp_soft_reset(struct rkispp_hw_dev *hw)
reset_control_deassert(hw->reset);
udelay(20);
}
if (domain)
iommu_attach_device(domain, hw->dev);
/* refresh iommu after reset */
if (hw->is_mmu) {
rockchip_iommu_disable(hw->dev);
rockchip_iommu_enable(hw->dev);
}
writel(SW_SCL_BYPASS, hw->base_addr + RKISPP_SCL0_CTRL);
writel(SW_SCL_BYPASS, hw->base_addr + RKISPP_SCL1_CTRL);