diff options
| author | Marcel Tunnissen <Marcel.Tuennissen@stericsson.com> | 2011-03-17 09:23:48 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:14:59 +0200 |
| commit | 4ef53cec815b65431140b6b7cf2c4f77f0553eaa (patch) | |
| tree | febc546df02ea77a6cf649bc8eee25c1dc901d4d | |
| parent | 4f218b1e9d4c46120c704efa395c4b1bcca5655f (diff) | |
video: mcde: Remove special SDTV watermark level
This will remove the special setting for the watermark level in MCDE for
SDTV out through AV8100. As a consequence MCDE setup is independent of
AV8100 running SDTV or HDMI.
ST-Ericsson ID: AP 329318
Linux-next: ST-Ericsson ID: ER 282779
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I65e80303a76c9a7887611fea8284cb4598b37c83
Signed-off-by: Marcel Tunnissen <Marcel.Tuennissen@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18526
Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
Tested-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Reviewed-by: Dan JOHANSSON <dan.johansson@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rw-r--r-- | drivers/video/mcde/mcde_hw.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/video/mcde/mcde_hw.c b/drivers/video/mcde/mcde_hw.c index 10420180fe4..1b171017161 100644 --- a/drivers/video/mcde/mcde_hw.c +++ b/drivers/video/mcde/mcde_hw.c @@ -1443,16 +1443,11 @@ static void update_overlay_registers(u8 idx, struct ovly_regs *regs, fifo_size = get_output_fifo_size(fifo); - if (port->hdmi_sdtv_switch == SDTV_SWITCH) - /* TODO: check if these wtrmrk levels work for HDMI as well. */ - pixelfetchwtrmrklevel = MCDE_PIXFETCH_SMALL_WTRMRKLVL; - else { - if ((fifo == MCDE_FIFO_A || fifo == MCDE_FIFO_B) && - regs->ppl >= fifo_size * 2) - pixelfetchwtrmrklevel = MCDE_PIXFETCH_LARGE_WTRMRKLVL; - else - pixelfetchwtrmrklevel = MCDE_PIXFETCH_MEDIUM_WTRMRKLVL; - } + if ((fifo == MCDE_FIFO_A || fifo == MCDE_FIFO_B) && + regs->ppl >= fifo_size * 2) + pixelfetchwtrmrklevel = MCDE_PIXFETCH_LARGE_WTRMRKLVL; + else + pixelfetchwtrmrklevel = MCDE_PIXFETCH_MEDIUM_WTRMRKLVL; if (regs->reset_buf_id) { u32 sel_mod = MCDE_EXTSRC0CR_SEL_MOD_SOFTWARE_SEL; |