ge2d: merge ge2d from amlogic-3.14-dev [2/3]

PD#SWPL-4355

Problem:
ge2d: play video display mess when used ionvideo

Solution:
merge patch 'play video display mess when used ionvideo'
from amlogic-3.14-dev(PD#155143)

Verify:
verified on u200

Change-Id: Iaf34fe1d1c7e7637015dadaaf43e201cf28089b7
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Signed-off-by: Jian Cao <jian.cao@amlogic.com>

diff --git a/drivers/amlogic/media/common/ge2d/ge2d_hw.c b/drivers/amlogic/media/common/ge2d/ge2d_hw.c
index 088af43..079779d 100644 (file)
--- a/drivers/amlogic/media/common/ge2d/ge2d_hw.c
+++ b/drivers/amlogic/media/common/ge2d/ge2d_hw.c
@@ -903,8 +903,6 @@ void ge2d_set_cmd(struct ge2d_cmd_s *cfg)
                rate_h = (heighto * 10) / heighti;
                if (rate_h == 10) {
                        /* not scaler case */
-                       cfg->sc_vsc_en = 0;
-                       cfg->vsc_rpt_l0_num = 0;
                        cfg->vsc_ini_phase = 0;
                        ge2d_reg_set_bits(GE2D_SC_MISC_CTRL,
                                ((0 << 1) | (0 << 0)), 8, 2);
@@ -927,8 +925,6 @@ void ge2d_set_cmd(struct ge2d_cmd_s *cfg)
 
                if (rate_w == 10) {
                        /* not scaler case */
-                       cfg->sc_hsc_en = 0;
-                       cfg->hsc_rpt_p0_num = 0;
                        cfg->hsc_ini_phase = 0;
                        ge2d_reg_set_bits(GE2D_SC_MISC_CTRL,
                                ((0 << 1) | (0 << 0)), 8, 2);