diff --git a/drivers/video/rockchip/mpp/mpp_av1dec.c b/drivers/video/rockchip/mpp/mpp_av1dec.c index dd38e0134b06..797f2a870b0c 100644 --- a/drivers/video/rockchip/mpp/mpp_av1dec.c +++ b/drivers/video/rockchip/mpp/mpp_av1dec.c @@ -472,6 +472,7 @@ free_task: #define AV1_L2_CACHE_SHAPER_CTRL 0x20 #define AV1_L2_CACHE_SHAPER_EN BIT(0) +#define AV1_L2_CACHE_INT_MASK 0x30 #define AV1_L2_CACHE_PP0_Y_CONFIG0 0x84 #define AV1_L2_CACHE_PP0_Y_CONFIG2 0x8c #define AV1_L2_CACHE_PP0_Y_CONFIG3 0x90 @@ -526,6 +527,9 @@ static int av1dec_set_l2_cache(struct av1dec_dev *dec, struct av1dec_task *task) val = line_cnt | (max_h << 16); writel_relaxed(val, dec->reg_base[AV1DEC_CLASS_CACHE] + AV1_L2_CACHE_PP0_U_CONFIG3); + /* mask cache irq */ + writel_relaxed(0xf, dec->reg_base[AV1DEC_CLASS_CACHE] + AV1_L2_CACHE_INT_MASK); + /* shaper enable */ writel_relaxed(AV1_L2_CACHE_SHAPER_EN, dec->reg_base[AV1DEC_CLASS_CACHE] + AV1_L2_CACHE_SHAPER_CTRL); diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c index ea05b2219f55..0f7bac8c1e47 100644 --- a/drivers/video/rockchip/mpp/mpp_common.c +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -36,7 +36,7 @@ #include "mpp_common.h" #include "mpp_iommu.h" -#define MPP_WORK_TIMEOUT_DELAY (200) +#define MPP_WORK_TIMEOUT_DELAY (500) #define MPP_WAIT_TIMEOUT_DELAY (2000) /* Use 'v' as magic number */