samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
程式碼 問題 合併請求 Actions 套件 專案 版本發布 Wiki 動態

disp: msm: sde: rename MDSS_INTR_* enums to SDE_INTR_*

瀏覽代碼 
Rename sde_intr_enum members to prefix with SDE instead of
the old MDSS naming used in legacy display driver.

Change-Id: I21bc67b4a79b7e53af0ac1beaebb6e9482015b0f
Signed-off-by: Steve Cohen <cohens@codeaurora.org>
此提交包含在：
Steve Cohen
2019-05-31 18:42:48 -04:00
父節點 fdc63188f4
當前提交 5fe5765fd4
共有 3 個檔案被更改，包括 82 行新增 和 82 行删除
下載 Patch 檔 下載差異檔 展開所有檔案 折疊所有檔案

94
msm/sde/sde_hw_interrupts.c
查看文件

@@ -1060,7 +1060,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq = &sde_irq_tbl[idx];
switch (sde_irq->sde_irq_idx) {
case MDSS_INTR_SSPP_TOP0_INTR:
case SDE_INTR_SSPP_TOP0_INTR:
sde_irq->clr_off =
MDP_SSPP_TOP0_OFF+INTR_CLEAR;
sde_irq->en_off =
@@ -1068,7 +1068,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_SSPP_TOP0_OFF+INTR_STATUS;
break;
case MDSS_INTR_SSPP_TOP0_INTR2:
case SDE_INTR_SSPP_TOP0_INTR2:
sde_irq->clr_off =
MDP_SSPP_TOP0_OFF+INTR2_CLEAR;
sde_irq->en_off =
@@ -1076,7 +1076,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_SSPP_TOP0_OFF+INTR2_STATUS;
break;
case MDSS_INTR_SSPP_TOP0_HIST_INTR:
case SDE_INTR_SSPP_TOP0_HIST_INTR:
sde_irq->clr_off =
MDP_SSPP_TOP0_OFF+HIST_INTR_CLEAR;
sde_irq->en_off =
@@ -1084,7 +1084,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_SSPP_TOP0_OFF+HIST_INTR_STATUS;
break;
case MDSS_INTR_INTF_0_INTR:
case SDE_INTR_INTF_0_INTR:
sde_irq->clr_off =
MDP_INTF_0_OFF+INTF_INTR_CLEAR;
sde_irq->en_off =
@@ -1092,7 +1092,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_INTF_0_OFF+INTF_INTR_STATUS;
break;
case MDSS_INTR_INTF_1_INTR:
case SDE_INTR_INTF_1_INTR:
sde_irq->clr_off =
MDP_INTF_1_OFF+INTF_INTR_CLEAR;
sde_irq->en_off =
@@ -1100,7 +1100,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_INTF_1_OFF+INTF_INTR_STATUS;
break;
case MDSS_INTR_INTF_2_INTR:
case SDE_INTR_INTF_2_INTR:
sde_irq->clr_off =
MDP_INTF_2_OFF+INTF_INTR_CLEAR;
sde_irq->en_off =
@@ -1108,7 +1108,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_INTF_2_OFF+INTF_INTR_STATUS;
break;
case MDSS_INTR_INTF_3_INTR:
case SDE_INTR_INTF_3_INTR:
sde_irq->clr_off =
MDP_INTF_3_OFF+INTF_INTR_CLEAR;
sde_irq->en_off =
@@ -1116,7 +1116,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_INTF_3_OFF+INTF_INTR_STATUS;
break;
case MDSS_INTR_INTF_4_INTR:
case SDE_INTR_INTF_4_INTR:
sde_irq->clr_off =
MDP_INTF_4_OFF+INTF_INTR_CLEAR;
sde_irq->en_off =
@@ -1124,7 +1124,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_INTF_4_OFF+INTF_INTR_STATUS;
break;
case MDSS_INTR_AD4_0_INTR:
case SDE_INTR_AD4_0_INTR:
sde_irq->clr_off =
MDP_AD4_0_OFF + MDP_AD4_INTR_CLEAR_OFF;
sde_irq->en_off =
@@ -1132,7 +1132,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_AD4_0_OFF + MDP_AD4_INTR_STATUS_OFF;
break;
case MDSS_INTR_AD4_1_INTR:
case SDE_INTR_AD4_1_INTR:
sde_irq->clr_off =
MDP_AD4_1_OFF + MDP_AD4_INTR_CLEAR_OFF;
sde_irq->en_off =
@@ -1140,7 +1140,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_AD4_1_OFF + MDP_AD4_INTR_STATUS_OFF;
break;
case MDSS_INTF_TEAR_1_INTR:
case SDE_INTF_TEAR_1_INTR:
sde_irq->clr_off = MDP_INTF_TEAR_INTF_1_IRQ_OFF +
MDP_INTF_TEAR_INTR_CLEAR_OFF;
sde_irq->en_off =
@@ -1149,7 +1149,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off = MDP_INTF_TEAR_INTF_1_IRQ_OFF +
MDP_INTF_TEAR_INTR_STATUS_OFF;
break;
case MDSS_INTF_TEAR_2_INTR:
case SDE_INTF_TEAR_2_INTR:
sde_irq->clr_off = MDP_INTF_TEAR_INTF_2_IRQ_OFF +
MDP_INTF_TEAR_INTR_CLEAR_OFF;
sde_irq->en_off = MDP_INTF_TEAR_INTF_2_IRQ_OFF +
@@ -1157,7 +1157,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off = MDP_INTF_TEAR_INTF_2_IRQ_OFF +
MDP_INTF_TEAR_INTR_STATUS_OFF;
break;
case MDSS_INTR_LTM_0_INTR:
case SDE_INTR_LTM_0_INTR:
sde_irq->clr_off =
MDP_LTM_0_OFF + MDP_LTM_INTR_CLEAR_OFF;
sde_irq->en_off =
@@ -1165,7 +1165,7 @@ static inline int _sde_hw_intr_init_sde_irq_tbl(u32 irq_tbl_size,
sde_irq->status_off =
MDP_LTM_0_OFF + MDP_LTM_INTR_STATUS_OFF;
break;
case MDSS_INTR_LTM_1_INTR:
case SDE_INTR_LTM_1_INTR:
sde_irq->clr_off =
MDP_LTM_1_OFF + MDP_LTM_INTR_CLEAR_OFF;
sde_irq->en_off =
@@ -1203,46 +1203,46 @@ static inline u32 _get_irq_map_size(int idx)
u32 ret = 0;
switch (idx) {
case MDSS_INTR_SSPP_TOP0_INTR:
case SDE_INTR_SSPP_TOP0_INTR:
ret = ARRAY_SIZE(sde_irq_intr_map);
break;
case MDSS_INTR_SSPP_TOP0_INTR2:
case SDE_INTR_SSPP_TOP0_INTR2:
ret = ARRAY_SIZE(sde_irq_intr2_map);
break;
case MDSS_INTR_SSPP_TOP0_HIST_INTR:
case SDE_INTR_SSPP_TOP0_HIST_INTR:
ret = ARRAY_SIZE(sde_irq_hist_map);
break;
case MDSS_INTR_INTF_0_INTR:
case SDE_INTR_INTF_0_INTR:
ret = ARRAY_SIZE(sde_irq_intf0_map);
break;
case MDSS_INTR_INTF_1_INTR:
case SDE_INTR_INTF_1_INTR:
ret = ARRAY_SIZE(sde_irq_inf1_map);
break;
case MDSS_INTR_INTF_2_INTR:
case SDE_INTR_INTF_2_INTR:
ret = ARRAY_SIZE(sde_irq_intf2_map);
break;
case MDSS_INTR_INTF_3_INTR:
case SDE_INTR_INTF_3_INTR:
ret = ARRAY_SIZE(sde_irq_intf3_map);
break;
case MDSS_INTR_INTF_4_INTR:
case SDE_INTR_INTF_4_INTR:
ret = ARRAY_SIZE(sde_irq_inf4_map);
break;
case MDSS_INTR_AD4_0_INTR:
case SDE_INTR_AD4_0_INTR:
ret = ARRAY_SIZE(sde_irq_ad4_0_map);
break;
case MDSS_INTR_AD4_1_INTR:
case SDE_INTR_AD4_1_INTR:
ret = ARRAY_SIZE(sde_irq_ad4_1_map);
break;
case MDSS_INTF_TEAR_1_INTR:
case SDE_INTF_TEAR_1_INTR:
ret = ARRAY_SIZE(sde_irq_intf1_te_map);
break;
case MDSS_INTF_TEAR_2_INTR:
case SDE_INTF_TEAR_2_INTR:
ret = ARRAY_SIZE(sde_irq_intf2_te_map);
break;
case MDSS_INTR_LTM_0_INTR:
case SDE_INTR_LTM_0_INTR:
ret = ARRAY_SIZE(sde_irq_ltm_0_map);
break;
case MDSS_INTR_LTM_1_INTR:
case SDE_INTR_LTM_1_INTR:
ret = ARRAY_SIZE(sde_irq_ltm_1_map);
break;
default:
@@ -1257,46 +1257,46 @@ static inline struct sde_irq_type *_get_irq_map_addr(int idx)
struct sde_irq_type *ret = NULL;
switch (idx) {
case MDSS_INTR_SSPP_TOP0_INTR:
case SDE_INTR_SSPP_TOP0_INTR:
ret = sde_irq_intr_map;
break;
case MDSS_INTR_SSPP_TOP0_INTR2:
case SDE_INTR_SSPP_TOP0_INTR2:
ret = sde_irq_intr2_map;
break;
case MDSS_INTR_SSPP_TOP0_HIST_INTR:
case SDE_INTR_SSPP_TOP0_HIST_INTR:
ret = sde_irq_hist_map;
break;
case MDSS_INTR_INTF_0_INTR:
case SDE_INTR_INTF_0_INTR:
ret = sde_irq_intf0_map;
break;
case MDSS_INTR_INTF_1_INTR:
case SDE_INTR_INTF_1_INTR:
ret = sde_irq_inf1_map;
break;
case MDSS_INTR_INTF_2_INTR:
case SDE_INTR_INTF_2_INTR:
ret = sde_irq_intf2_map;
break;
case MDSS_INTR_INTF_3_INTR:
case SDE_INTR_INTF_3_INTR:
ret = sde_irq_intf3_map;
break;
case MDSS_INTR_INTF_4_INTR:
case SDE_INTR_INTF_4_INTR:
ret = sde_irq_inf4_map;
break;
case MDSS_INTR_AD4_0_INTR:
case SDE_INTR_AD4_0_INTR:
ret = sde_irq_ad4_0_map;
break;
case MDSS_INTR_AD4_1_INTR:
case SDE_INTR_AD4_1_INTR:
ret = sde_irq_ad4_1_map;
break;
case MDSS_INTF_TEAR_1_INTR:
case SDE_INTF_TEAR_1_INTR:
ret = sde_irq_intf1_te_map;
break;
case MDSS_INTF_TEAR_2_INTR:
case SDE_INTF_TEAR_2_INTR:
ret = sde_irq_intf2_te_map;
break;
case MDSS_INTR_LTM_0_INTR:
case SDE_INTR_LTM_0_INTR:
ret = sde_irq_ltm_0_map;
break;
case MDSS_INTR_LTM_1_INTR:
case SDE_INTR_LTM_1_INTR:
ret = sde_irq_ltm_1_map;
break;
default:
@@ -1337,7 +1337,7 @@ static int _sde_hw_intr_init_irq_tables(struct sde_hw_intr *intr,
u32 sde_irq_map_idx = 0;
/* Initialize the offset of the irq's in the sde_irq_map table */
for (idx = 0; idx < MDSS_INTR_MAX; idx++) {
for (idx = 0; idx < SDE_INTR_MAX; idx++) {
if (test_bit(idx, m->mdss_irqs)) {
low_idx = sde_irq_map_idx;
high_idx = low_idx + _get_irq_map_size(idx);
@@ -1419,14 +1419,14 @@ struct sde_hw_intr *sde_hw_intr_init(void __iomem *addr,
}
__setup_intr_ops(&intr->ops);
if (MDSS_INTR_MAX >= UINT_MAX) {
pr_err("max intr exceeded:%d\n", MDSS_INTR_MAX);
if (SDE_INTR_MAX >= UINT_MAX) {
pr_err("max intr exceeded:%d\n", SDE_INTR_MAX);
ret = -EINVAL;
goto exit;
}
/* check how many irq's this target supports */
for (idx = 0; idx < MDSS_INTR_MAX; idx++) {
for (idx = 0; idx < SDE_INTR_MAX; idx++) {
if (test_bit(idx, m->mdss_irqs)) {
irq_regs_count++;
@@ -1442,7 +1442,7 @@ struct sde_hw_intr *sde_hw_intr_init(void __iomem *addr,
}
}
if (irq_regs_count == 0 || irq_regs_count > MDSS_INTR_MAX ||
if (irq_regs_count == 0 || irq_regs_count > SDE_INTR_MAX ||
irq_map_count == 0) {
pr_err("wrong mapping of supported irqs 0x%lx\n",
m->mdss_irqs[0]);