diff options
| author | Jimmy Rubin <jimmy.rubin@stericsson.com> | 2011-02-16 10:14:30 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:03:51 +0200 |
| commit | 3d8e26d6b3f1eeade0899d3567298f21bb91bdbf (patch) | |
| tree | a59adad1e670b40618722aa51cd1a1df6e18fadf /drivers | |
| parent | 32fa096d1772be1487322de1d081a1425e45a026 (diff) | |
video: mcde: Change handling of pix format
Disable channel is no longer needed when the overlay pixel format
is changed.
ST-Ericsson ID: 323997
ST-Ericsson Linux next: Not tested, ER 282779
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I18c74e74a8a3172f55dbfbbfc91da81b9e9100ca
Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com>
Signed-off-by: Marcel Tunnissen <Marcel.Tuennissen@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16861
Tested-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Reviewed-by: Dan JOHANSSON <dan.johansson@stericsson.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/mcde/display-av8100.c | 2 | ||||
| -rw-r--r-- | drivers/video/mcde/mcde_display.c | 12 | ||||
| -rw-r--r-- | drivers/video/mcde/mcde_fb.c | 3 |
3 files changed, 3 insertions, 14 deletions
diff --git a/drivers/video/mcde/display-av8100.c b/drivers/video/mcde/display-av8100.c index b55f144923f..be8d9fcbe53 100644 --- a/drivers/video/mcde/display-av8100.c +++ b/drivers/video/mcde/display-av8100.c @@ -688,8 +688,6 @@ static int hdmi_set_pixel_format( ret = mcde_chnl_set_palette(ddev->chnl_state, NULL); } - ddev->update_flags |= UPDATE_FLAG_PIXEL_FORMAT; - return 0; } diff --git a/drivers/video/mcde/mcde_display.c b/drivers/video/mcde/mcde_display.c index fcca1e277fc..521446dc26f 100644 --- a/drivers/video/mcde/mcde_display.c +++ b/drivers/video/mcde/mcde_display.c @@ -175,8 +175,6 @@ static int mcde_display_set_pixel_format_default( return ret; } - ddev->update_flags |= UPDATE_FLAG_PIXEL_FORMAT; - return 0; } @@ -186,11 +184,6 @@ static inline enum mcde_ovly_pix_fmt mcde_display_get_pixel_format_default( return ddev->pixel_format; } -static inline enum mcde_port_pix_fmt mcde_display_get_port_pixel_format_default( - struct mcde_display_device *ddev) -{ - return ddev->port->pixel_format; -} static int mcde_display_set_rotation_default(struct mcde_display_device *ddev, enum mcde_display_rotation rotation) @@ -274,8 +267,7 @@ static int mcde_display_apply_config_default(struct mcde_display_device *ddev) if (!ddev->update_flags) return 0; - if ((ddev->update_flags & UPDATE_FLAG_VIDEO_MODE) || - (ddev->update_flags & UPDATE_FLAG_PIXEL_FORMAT)) + if (ddev->update_flags & UPDATE_FLAG_VIDEO_MODE) mcde_chnl_stop_flow(ddev->chnl_state); ret = mcde_chnl_apply(ddev->chnl_state); @@ -421,8 +413,6 @@ void mcde_display_init_device(struct mcde_display_device *ddev) ddev->get_video_mode = mcde_display_get_video_mode_default; ddev->set_pixel_format = mcde_display_set_pixel_format_default; ddev->get_pixel_format = mcde_display_get_pixel_format_default; - ddev->get_port_pixel_format = - mcde_display_get_port_pixel_format_default; ddev->set_rotation = mcde_display_set_rotation_default; ddev->get_rotation = mcde_display_get_rotation_default; ddev->set_synchronized_update = diff --git a/drivers/video/mcde/mcde_fb.c b/drivers/video/mcde/mcde_fb.c index 4cb085ca045..1251d81cba4 100644 --- a/drivers/video/mcde/mcde_fb.c +++ b/drivers/video/mcde/mcde_fb.c @@ -491,7 +491,6 @@ static int apply_var(struct fb_info *fbi, struct mcde_display_device *ddev) /* Apply pixel format */ fmt = var_to_pix_fmt_info(var); mfb->pix_fmt = fmt->pix_fmt; - mcde_dss_set_pixel_format(ddev, mfb->pix_fmt); /* Apply rotation */ mcde_dss_set_rotation(ddev, var_to_rotation(var)); @@ -648,6 +647,8 @@ struct fb_info *mcde_fb_create(struct mcde_display_device *ddev, if (ret) goto apply_var_failed; + mcde_dss_set_pixel_format(ddev, ddev->port->pixel_format); + /* Setup overlay */ get_ovly_info(fbi, NULL, &ovly_info); ovly = mcde_dss_create_overlay(ddev, &ovly_info); |