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

media: rockchip: vpss: fix online mul_sensor affect offline

Browse Source 
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I65e0608fe410baee2d8008b3823bd8322edd7c4d
This commit is contained in:
Mingwei Yan
2024-07-08 17:12:49 +08:00
committed by Tao Huang
parent 88f19f9178
commit f42fc97328
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/rockchip/vpss/common.c
View File

@@ -111,6 +111,8 @@ void rkvpss_update_regs(struct rkvpss_device *dev, u32 start, u32 end)
mask |= (RKVPSS_ISP2VPSS_CHN0_SEL(3) << j * 2);
}
*val |= (readl(base + i) & mask);
} else {
*val |= readl(base + i);
}
}
writel(*val, base + i);

3
drivers/media/platform/rockchip/vpss/hw.c
View File

@@ -519,7 +519,8 @@ void rkvpss_soft_reset(struct rkvpss_hw_dev *hw)
rockchip_iommu_enable(hw->dev);
}
rkvpss_hw_write(hw, RKVPSS_VPSS_CTRL, RKVPSS_ACK_FRM_PRO_DIS);
rkvpss_hw_set_bits(hw, RKVPSS_VPSS_CTRL, RKVPSS_ACK_FRM_PRO_DIS,
RKVPSS_ACK_FRM_PRO_DIS);
rkvpss_hw_write(hw, RKVPSS_VPSS_IRQ_CFG, 0x3fff);
rkvpss_hw_write(hw, RKVPSS_MI_IMSC, 0xd0000000);
rkvpss_hw_set_bits(hw, RKVPSS_VPSS_ONLINE, RKVPSS_ONLINE_MODE_MASK,

6
drivers/media/platform/rockchip/vpss/regs.h
View File

@@ -1179,8 +1179,10 @@
#define IS_SYNC_REG(x) ({ \
typeof(x) __x = (x); \
(__x == RKVPSS_VPSS_CTRL || __x == RKVPSS_VPSS_ONLINE || \
__x == RKVPSS_VPSS_UPDATE || __x == RKVPSS_MI_WR_INIT || \
__x == RKVPSS_MI_WR_WRAP_CTRL || __x == RKVPSS_MI_WR_VFLIP_CTRL); \
__x == RKVPSS_VPSS_UPDATE || __x == RKVPSS_VPSS_CLK_GATE || \
__x == RKVPSS_VPSS_IMSC || __x == RKVPSS_MI_WR_CTRL || \
__x == RKVPSS_MI_WR_INIT || __x == RKVPSS_MI_WR_WRAP_CTRL || \
__x == RKVPSS_MI_WR_VFLIP_CTRL); \
})
#endif