From: Jihong Sui Date: Tue, 17 Sep 2019 11:50:40 +0000 (+0800) Subject: deinterlace: delete reg_req_flag_irq to avoid failed reg. [1/1] X-Git-Tag: hardkernel-4.9.236-104~632 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c7d8691a1b577b83889b54f800a9a277b92600d;p=platform%2Fkernel%2Flinux-amlogic.git deinterlace: delete reg_req_flag_irq to avoid failed reg. [1/1] PD#SWPL-14260 Problem: variable reg_req_flag_irq is redundant and it has a probability of causing error reg. Solution: delete this variable. Verify: tl1 Change-Id: I807f32789acdf4b8e0fea88f9786a301638460ff Signed-off-by: Jihong Sui --- diff --git a/drivers/amlogic/media/deinterlace/deinterlace.c b/drivers/amlogic/media/deinterlace/deinterlace.c index 2189602..59573e2 100644 --- a/drivers/amlogic/media/deinterlace/deinterlace.c +++ b/drivers/amlogic/media/deinterlace/deinterlace.c @@ -6994,7 +6994,7 @@ static void di_reg_process_irq(void) di_pre_stru.retry_index = 0; init_flag = 1; - di_pre_stru.reg_req_flag_irq = 1; + /*di_pre_stru.reg_req_flag_irq = 1;*/ } di_pre_stru.reg_irq_busy = false; } @@ -7209,11 +7209,11 @@ static int di_task_handle(void *data) } #endif } - if (di_pre_stru.reg_req_flag_irq || + if (/*di_pre_stru.reg_req_flag_irq ||*/ di_pre_stru.reg_req_flag) { di_reg_process(); di_pre_stru.reg_req_flag = 0; - di_pre_stru.reg_req_flag_irq = 0; + /*di_pre_stru.reg_req_flag_irq = 0;*/ } #ifdef CONFIG_CMA /* mutex_lock(&de_devp->cma_mutex);*/ @@ -7282,7 +7282,7 @@ static void di_pre_process_irq(struct di_pre_stru_s *pre_stru_p) if (pre_stru_p->unreg_req_flag_irq && (di_pre_stru.pre_de_busy == 0)) di_unreg_process_irq(); - if (init_flag == 0 && pre_stru_p->reg_req_flag_irq == 0 + if (init_flag == 0 /*&& pre_stru_p->reg_req_flag_irq == 0*/ && (!atomic_read(&di_flag_unreg))) di_reg_process_irq(); } diff --git a/drivers/amlogic/media/deinterlace/deinterlace.h b/drivers/amlogic/media/deinterlace/deinterlace.h index 996170d..b4c08d8 100644 --- a/drivers/amlogic/media/deinterlace/deinterlace.h +++ b/drivers/amlogic/media/deinterlace/deinterlace.h @@ -299,7 +299,7 @@ struct di_pre_stru_s { int unreg_req_flag_irq; int unreg_req_flag_cnt; int reg_req_flag; - int reg_req_flag_irq; + /*int reg_req_flag_irq;*/ int reg_req_flag_cnt; int reg_irq_busy; int force_unreg_req_flag; diff --git a/drivers/amlogic/media/deinterlace/deinterlace_dbg.c b/drivers/amlogic/media/deinterlace/deinterlace_dbg.c index 5d9d3af..0f9079c 100644 --- a/drivers/amlogic/media/deinterlace/deinterlace_dbg.c +++ b/drivers/amlogic/media/deinterlace/deinterlace_dbg.c @@ -475,8 +475,10 @@ void dump_di_pre_stru(struct di_pre_stru_s *di_pre_stru_p) di_pre_stru_p->unreg_req_flag_irq); pr_info("reg_req_flag = %d\n", di_pre_stru_p->reg_req_flag); + #ifdef DI_KEEP_HIS pr_info("reg_req_flag_irq = %d\n", di_pre_stru_p->reg_req_flag_irq); + #endif pr_info("cur_width = %d\n", di_pre_stru_p->cur_width); pr_info("cur_height = %d\n", @@ -547,8 +549,10 @@ static int dump_di_pre_stru_seq(struct seq_file *seq, void *v) di_pre_stru_p->unreg_req_flag_irq); seq_printf(seq, "%-25s = %d\n", "reg_req_flag", di_pre_stru_p->reg_req_flag); + #ifdef DI_KEEP_HIS seq_printf(seq, "%-25s = %d\n", "reg_req_flag_irq", di_pre_stru_p->reg_req_flag_irq); + #endif seq_printf(seq, "%-25s = %d\n", "cur_width", di_pre_stru_p->cur_width); seq_printf(seq, "%-25s = %d\n", "cur_height",