aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Tunnissen <Marcel.Tuennissen@stericsson.com>2011-05-02 16:28:16 +0200
committerLinus WALLEIJ <linus.walleij@stericsson.com>2011-05-05 17:23:03 +0200
commitbd75a87b668cbd91e6459dc8a0721104bfd3abe3 (patch)
treea222f1c7220881270a727913b7711248609cec94
parent933da2301262ba4bd345f850eb6b7b30d8db17c1 (diff)
video: av8100: Fix YUV port setting from startupu8500-android-2.3_v0.74
Fixes the problem that configuring the YUV 422 port pixel format for AV8100 doesn't work from start up. The problem is that the function hdmi_set_pixel_format doesn't really set up the FB pixel format. ST-Ericsson ID: 338206 ST-Ericsson Linux next: Not tested, ER 282779 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ib5a7d3379c5853ea08c27fe94eae788c456c36ce Signed-off-by: Marcel Tunnissen <Marcel.Tuennissen@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22273 Tested-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QATEST Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com> Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
-rw-r--r--drivers/video/mcde/display-av8100.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/video/mcde/display-av8100.c b/drivers/video/mcde/display-av8100.c
index 5d400a9958e..3a25e70a7c0 100644
--- a/drivers/video/mcde/display-av8100.c
+++ b/drivers/video/mcde/display-av8100.c
@@ -948,17 +948,24 @@ static u16 map_u(u8 in)
static int hdmi_set_pixel_format(
struct mcde_display_device *ddev, enum mcde_ovly_pix_fmt format)
{
+ dev_dbg(&ddev->dev, "%s\n", __func__);
+ ddev->pixel_format = format;
+
+ return 0;
+}
+
+static int hdmi_set_port_pixel_format(struct mcde_display_device *ddev)
+{
int ret;
dev_dbg(&ddev->dev, "%s\n", __func__);
- ddev->pixel_format = format;
mcde_chnl_stop_flow(ddev->chnl_state);
ret = mcde_chnl_set_pixel_format(ddev->chnl_state,
ddev->port->pixel_format);
if (ret < 0) {
- dev_warn(&ddev->dev, "%s:Failed to set pixel format = %d\n",
- __func__, format);
+ dev_warn(&ddev->dev, "%s: Failed to set pixel format = %d\n",
+ __func__, ddev->port->pixel_format);
return ret;
}
@@ -1105,6 +1112,8 @@ static int hdmi_set_power_mode(struct mcde_display_device *ddev,
driver_data->cvbs_regulator_enabled = true;
}
ddev->power_mode = MCDE_DISPLAY_PM_STANDBY;
+
+ hdmi_set_port_pixel_format(ddev);
}
/* STANDBY -> ON */
if (ddev->power_mode == MCDE_DISPLAY_PM_STANDBY &&