From: Jian Cao <jian.cao@amlogic.com>
Date: Fri, 25 Jan 2019 08:40:51 +0000 (+0800)
Subject: ge2d: merge ge2d from amlogic-3.14-dev  [1/3]
X-Git-Tag: hardkernel-4.9.236-104~1787
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f614e362ea98589a152d63604ddef8197fbaca6f;p=platform%2Fkernel%2Flinux-amlogic.git

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

PD#SWPL-4355

Problem:
ge2d: fix ge2d bitblt error

Solution:
merge patch 'fix ge2d bitblt error' from amlogic-3.14-dev(PD#154877)

Verify:
verified on u200

Change-Id: I4a813810837814931c3cb68f9a0f8a0929b06540
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 3a886ff..088af43 100644
--- a/drivers/amlogic/media/common/ge2d/ge2d_hw.c
+++ b/drivers/amlogic/media/common/ge2d/ge2d_hw.c
@@ -901,20 +901,20 @@ void ge2d_set_cmd(struct ge2d_cmd_s *cfg)
 	if (!gaul_filter_used) {
 		rate_w = (widtho * 10) / widthi;
 		rate_h = (heighto * 10) / heighti;
-		if (rate_w == 10) {
+		if (rate_h == 10) {
 			/* not scaler case */
-			cfg->sc_vsc_en = 1;
-			cfg->vsc_rpt_l0_num = 1;
+			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);
-		} else if (rate_w < 10) {
+		} else if (rate_h < 10) {
 			/* scaler down case */
 			cfg->sc_vsc_en = 1;
 			cfg->vsc_rpt_l0_num = 1;
-			if (rate_w != 0)
+			if (rate_h != 0)
 				cfg->vsc_ini_phase =
-					0x5000000/rate_w - 0x800000;
+					0x5000000/rate_h - 0x800000;
 			else
 				cfg->vsc_ini_phase = 0x5000000;
 		} else {
@@ -922,23 +922,23 @@ void ge2d_set_cmd(struct ge2d_cmd_s *cfg)
 			cfg->sc_vsc_en = 1;
 			cfg->vsc_rpt_l0_num = 2;
 			cfg->vsc_ini_phase =
-				0x800000 + 0x5000000/rate_w;
+				0x800000 + 0x5000000/rate_h;
 		}
 
-		if (rate_h == 10) {
+		if (rate_w == 10) {
 			/* not scaler case */
-			cfg->sc_hsc_en = 1;
-			cfg->hsc_rpt_p0_num = 1;
+			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);
-		} else if (rate_h < 10) {
+		} else if (rate_w < 10) {
 			/* scaler down case */
 			cfg->sc_hsc_en = 1;
 			cfg->hsc_rpt_p0_num = 1;
-			if (rate_h != 0)
+			if (rate_w != 0)
 				cfg->hsc_ini_phase =
-					0x5000000/rate_h - 0x800000;
+					0x5000000/rate_w - 0x800000;
 			else
 				cfg->hsc_ini_phase = 0x5000000;
 		} else {
@@ -946,7 +946,7 @@ void ge2d_set_cmd(struct ge2d_cmd_s *cfg)
 			cfg->sc_hsc_en = 1;
 			cfg->hsc_rpt_p0_num = 2;
 			cfg->hsc_ini_phase =
-				0x800000 + 0x5000000/rate_h;
+				0x800000 + 0x5000000/rate_w;
 		}
 		/* expand src1/src2 color with 1 */
 		ge2d_reg_set_bits(GE2D_GEN_CTRL2, 1, 27, 1);