summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Tunnissen <Marcel.Tuennissen@stericsson.com>2011-03-17 14:00:41 +0100
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:14:59 +0200
commit3d76a38082d4def758464591cdd2c7a664edacfe (patch)
treecad5c1d3ad45ee59a968c32888e123ce84011191
parent4ef53cec815b65431140b6b7cf2c4f77f0553eaa (diff)
video: av8100: Fix occurences of test pattern
Fixes random occurences of test pattern for SDTV through AV8100, caused by uninitialized memory. ST-Ericsson ID: ER 329441 Linux-next: ST-Ericsson ID: ER 282779 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Idfed6bb2d4418345488c54ead4b19e30e9dc653e Signed-off-by: Marcel Tunnissen <Marcel.Tuennissen@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18563 Tested-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com> Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com> Reviewed-by: Dan JOHANSSON <dan.johansson@stericsson.com> Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--drivers/video/av8100/av8100.c3
-rw-r--r--drivers/video/mcde/display-av8100.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/av8100/av8100.c b/drivers/video/av8100/av8100.c
index 1db66172e0d..b60ab2f7bf5 100644
--- a/drivers/video/av8100/av8100.c
+++ b/drivers/video/av8100/av8100.c
@@ -833,6 +833,9 @@ static int av8100_config_init(void)
config.denc_format.enable = 0;
config.denc_format.macrovision_enable = 0;
config.denc_format.internal_generator = 0;
+ retval = av8100_conf_prep(AV8100_COMMAND_DENC, &config);
+ if (retval)
+ return -EFAULT;
/* Video output */
config.video_output_format.video_output_cea_vesa =
diff --git a/drivers/video/mcde/display-av8100.c b/drivers/video/mcde/display-av8100.c
index 163af1c3361..b55f144923f 100644
--- a/drivers/video/mcde/display-av8100.c
+++ b/drivers/video/mcde/display-av8100.c
@@ -725,6 +725,8 @@ static int hdmi_on_first_update(struct mcde_display_device *dev)
* Note HDMI and DENC are always turned off in set_video_mode.
*/
if (dev->port->hdmi_sdtv_switch == SDTV_SWITCH) {
+ if (av8100_conf_get(AV8100_COMMAND_DENC, &av8100_config))
+ return -EFAULT;
av8100_config.denc_format.enable = 1;
if (dev->video_mode.yres == NATIVE_YRES_SDTV) {
av8100_config.denc_format.standard_selection =