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

drm/rockchip: vop: Fix writeback interrupt process

Browse Source 
Fixes: f7e3199891 ("drm/rockchip: vop: Add writeback support")
Change-Id: I6740c489e472368be4b081c5490a776de535c5e7
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
This commit is contained in:
Chaoyi Chen
2025-05-16 14:22:25 +08:00
committed by Tao Huang
parent 7b808a6ad8
commit 51f120552c
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View File

@@ -1832,16 +1832,24 @@ static uint32_t vop_read_and_clear_wb_irqs(struct vop *vop)
const struct vop_data *vop_data = vop->data;
const struct vop_intr *intr = vop_data->wb_intr;
uint32_t irqs = VOPL_WB_UV_FIFO_FULL_INTR | VOPL_WB_YRGB_FIFO_FULL_INTR;
uint32_t val;
uint32_t val, ret;
if (!intr)
return 0;
val = VOP_INTR_GET_TYPE2(vop, intr, status, irqs);
ret = val;
/* For RV1126B, it should use VOPL_WB_YRGB_FIFO_FULL_INTR to
* clear all wb interrupt.
*/
if (vop->version == VOP_VERSION_RV1126B)
val |= VOPL_WB_YRGB_FIFO_FULL_INTR;
if (val)
VOP_INTR_SET_TYPE2(vop, intr, clear, val, 1);
return val;
return ret;
}
static void vop_wb_commit(struct drm_crtc *crtc)
@@ -5363,7 +5371,7 @@ static irqreturn_t vop_isr(int irq, void *data)
spin_unlock_irqrestore(&vop->irq_lock, flags);
/* This is expected for vop iommu irqs, since the irq is shared */
if (!active_irqs)
if (!active_irqs && !wb_irqs)
goto out_disable;
if (active_irqs & DSP_HOLD_VALID_INTR) {

4
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
View File

@@ -2039,8 +2039,10 @@ static const struct vop_wb_regs rv1126b_vop_wb_regs = {
};
static const int rv1126_wb_intrs[] = {
VOPL_WB_UV_FIFO_FULL_INTR,
VOPL_WB_YRGB_FIFO_FULL_INTR,
VOPL_WB_UV_FIFO_FULL_INTR,
0,
0,
VOPL_WB_COMPLETE_INTR,
};