From dfc9b75b0929ce8ee773568f450d71a331342896 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Wed, 5 Jun 2019 17:04:18 +0800 Subject: [PATCH] drm/rockchip: vop: delete rk3308 vop win empty irq Because rk3308 vop win empty isn't reliable, so we delete it. Change-Id: If033eb02c4d7174db8dde7984581e39c98ee4998 Signed-off-by: Sandy Huang --- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 27 ++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index 4d42451cb09d..5ea33c412489 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -1674,12 +1674,37 @@ static const struct vop_ctrl rk3308_ctrl_data = { 0xffffffff, 0), }; +static const int rk3308_vop_intrs[] = { + FS_INTR, + FS_NEW_INTR, + ADDR_SAME_INTR, + LINE_FLAG_INTR, + LINE_FLAG1_INTR, + BUS_ERROR_INTR, + 0, + 0, + DSP_HOLD_VALID_INTR, + DMA_FINISH_INTR, + 0, + POST_BUF_EMPTY_INTR +}; + +static const struct vop_intr rk3308_vop_intr = { + .intrs = rk3308_vop_intrs, + .nintrs = ARRAY_SIZE(rk3308_vop_intrs), + .line_flag_num[0] = VOP_REG(RK3366_LIT_LINE_FLAG, 0xfff, 0), + .line_flag_num[1] = VOP_REG(RK3366_LIT_LINE_FLAG, 0xfff, 16), + .status = VOP_REG_MASK(RK3366_LIT_INTR_STATUS, 0xffff, 0), + .enable = VOP_REG_MASK(RK3366_LIT_INTR_EN, 0xffff, 0), + .clear = VOP_REG_MASK(RK3366_LIT_INTR_CLEAR, 0xffff, 0), +}; + static const struct vop_data rk3308_vop = { .version = VOP_VERSION(2, 7), .max_input = {1920, 8192}, .max_output = {1920, 1080}, .ctrl = &rk3308_ctrl_data, - .intr = &rk3366_lit_intr, + .intr = &rk3308_vop_intr, .win = rk3366_vop_lit_win_data, .win_size = ARRAY_SIZE(rk3366_vop_lit_win_data), };