samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: update wb irq ctrl with a distinct dcwb irq table"

Browse Source
This commit is contained in:
qctecmdr
2021-03-02 14:24:28 -08:00
committed by Gerrit - the friendly Code Review server
parent 1269ba8e88 3fd3c6b7e5
commit dc40891a91
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
msm/sde/sde_encoder_phys_wb.c
View File

@@ -30,7 +30,11 @@
static const u32 cwb_irq_tbl[PINGPONG_MAX] = {SDE_NONE, INTR_IDX_PP1_OVFL, static const u32 cwb_irq_tbl[PINGPONG_MAX] = {SDE_NONE, INTR_IDX_PP1_OVFL,
INTR_IDX_PP2_OVFL, INTR_IDX_PP3_OVFL, INTR_IDX_PP4_OVFL, INTR_IDX_PP2_OVFL, INTR_IDX_PP3_OVFL, INTR_IDX_PP4_OVFL,
INTR_IDX_PP5_OVFL, INTR_IDX_PP_CWB_OVFL, SDE_NONE}; INTR_IDX_PP5_OVFL, SDE_NONE, SDE_NONE};
static const u32 dcwb_irq_tbl[PINGPONG_MAX] = {SDE_NONE, SDE_NONE,
SDE_NONE, SDE_NONE, SDE_NONE, SDE_NONE,
INTR_IDX_PP_CWB_OVFL, SDE_NONE};
/** /**
* sde_rgb2yuv_601l - rgb to yuv color space conversion matrix * sde_rgb2yuv_601l - rgb to yuv color space conversion matrix
@@ -1208,6 +1212,7 @@ static void sde_encoder_phys_wb_irq_ctrl(
int index = 0, refcount; int index = 0, refcount;
int ret = 0, pp = 0; int ret = 0, pp = 0;
u32 max_num_of_irqs = 0; u32 max_num_of_irqs = 0;
const u32 *irq_table = NULL;
if (!wb_enc) if (!wb_enc)
return; return;
@@ -1228,8 +1233,13 @@ static void sde_encoder_phys_wb_irq_ctrl(
* when D-CWB is enabled. * when D-CWB is enabled.
*/ */
wb_cfg = wb_enc->hw_wb->caps; wb_cfg = wb_enc->hw_wb->caps;
max_num_of_irqs = (wb_cfg->features & BIT(SDE_WB_HAS_DCWB)) ? if (wb_cfg->features & BIT(SDE_WB_HAS_DCWB)) {
1 : CRTC_DUAL_MIXERS_ONLY; max_num_of_irqs = 1;
irq_table = dcwb_irq_tbl;
} else {
max_num_of_irqs = CRTC_DUAL_MIXERS_ONLY;
irq_table = cwb_irq_tbl;
}
if (enable && atomic_inc_return(&phys->wbirq_refcount) == 1) { if (enable && atomic_inc_return(&phys->wbirq_refcount) == 1) {
sde_encoder_helper_register_irq(phys, INTR_IDX_WB_DONE); sde_encoder_helper_register_irq(phys, INTR_IDX_WB_DONE);
@@ -1237,9 +1247,9 @@ static void sde_encoder_phys_wb_irq_ctrl(
atomic_dec_return(&phys->wbirq_refcount); atomic_dec_return(&phys->wbirq_refcount);
for (index = 0; index < max_num_of_irqs; index++) for (index = 0; index < max_num_of_irqs; index++)
if (cwb_irq_tbl[index + pp] != SDE_NONE) if (irq_table[index + pp] != SDE_NONE)
sde_encoder_helper_register_irq(phys, sde_encoder_helper_register_irq(phys,
cwb_irq_tbl[index + pp]); irq_table[index + pp]);
} else if (!enable && } else if (!enable &&
atomic_dec_return(&phys->wbirq_refcount) == 0) { atomic_dec_return(&phys->wbirq_refcount) == 0) {
sde_encoder_helper_unregister_irq(phys, INTR_IDX_WB_DONE); sde_encoder_helper_unregister_irq(phys, INTR_IDX_WB_DONE);
@@ -1247,9 +1257,9 @@ static void sde_encoder_phys_wb_irq_ctrl(
atomic_inc_return(&phys->wbirq_refcount); atomic_inc_return(&phys->wbirq_refcount);
for (index = 0; index < max_num_of_irqs; index++) for (index = 0; index < max_num_of_irqs; index++)
if (cwb_irq_tbl[index + pp] != SDE_NONE) if (irq_table[index + pp] != SDE_NONE)
sde_encoder_helper_unregister_irq(phys, sde_encoder_helper_unregister_irq(phys,
cwb_irq_tbl[index + pp]); irq_table[index + pp]);
} }
} }