36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From ed7a9223f6785be03951c55f3b0695b0d5635c80 Mon Sep 17 00:00:00 2001
|
|
From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com>
|
|
Date: Thu, 9 Apr 2009 15:04:44 +0200
|
|
Subject: [PATCH] DSS2: Fix DISPC_VID_FIR value for omap34xx
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=utf-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The msbs of the DISPC_VID_FIR fields were incorrectly masked out on
|
|
omap34xx and thus 4:1 downscale did not work correctly.
|
|
|
|
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
|
|
---
|
|
drivers/video/omap2/dss/dispc.c | 5 ++++-
|
|
1 files changed, 4 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
|
|
index 076d3d4..b8a3329 100644
|
|
--- a/drivers/video/omap2/dss/dispc.c
|
|
+++ b/drivers/video/omap2/dss/dispc.c
|
|
@@ -994,7 +994,10 @@ static void _dispc_set_fir(enum omap_plane plane, int hinc, int vinc)
|
|
|
|
BUG_ON(plane == OMAP_DSS_GFX);
|
|
|
|
- val = FLD_VAL(vinc, 27, 16) | FLD_VAL(hinc, 11, 0);
|
|
+ if (cpu_is_omap24xx())
|
|
+ val = FLD_VAL(vinc, 27, 16) | FLD_VAL(hinc, 11, 0);
|
|
+ else
|
|
+ val = FLD_VAL(vinc, 28, 16) | FLD_VAL(hinc, 12, 0);
|
|
dispc_write_reg(fir_reg[plane-1], val);
|
|
}
|
|
|
|
--
|
|
1.5.6.5
|
|
|