aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sh_mobile_hdmi.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-11-28 19:07:50 -0500
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-03-12 17:40:54 -0400
commitd30555d24e462edf439a1057114e1b0df76c89ef (patch)
tree2190e2c8dfa14c065aa6043e28295d467d333b11 /drivers/video/sh_mobile_hdmi.c
parente0c8601a18969229eb63065e5c3176319c785288 (diff)
fbdev: sh_mobile_hdmi: Don't set sh_hdmi::mode in the display on handler
The struct sh_hdmi mode field is only used after being assigned by the EDID read code. There is thus no need to initialize it from the LCDC display var in the display on handler. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/video/sh_mobile_hdmi.c')
-rw-r--r--drivers/video/sh_mobile_hdmi.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index 261760949718..37f935fd5a10 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -995,7 +995,6 @@ static irqreturn_t sh_hdmi_hotplug(int irq, void *dev_id)
995static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity) 995static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity)
996{ 996{
997 struct sh_hdmi *hdmi = entity_to_sh_hdmi(entity); 997 struct sh_hdmi *hdmi = entity_to_sh_hdmi(entity);
998 struct sh_mobile_lcdc_chan *ch = entity->lcdc;
999 998
1000 dev_dbg(hdmi->dev, "%s(%p): state %x\n", __func__, hdmi, 999 dev_dbg(hdmi->dev, "%s(%p): state %x\n", __func__, hdmi,
1001 hdmi->hp_state); 1000 hdmi->hp_state);
@@ -1006,15 +1005,10 @@ static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity)
1006 * HDMI_HOTPLUG_CONNECTED: on monitor plug-in 1005 * HDMI_HOTPLUG_CONNECTED: on monitor plug-in
1007 * HDMI_HOTPLUG_EDID_DONE: on EDID read completion 1006 * HDMI_HOTPLUG_EDID_DONE: on EDID read completion
1008 */ 1007 */
1009 switch (hdmi->hp_state) { 1008 if (hdmi->hp_state == HDMI_HOTPLUG_EDID_DONE) {
1010 case HDMI_HOTPLUG_EDID_DONE:
1011 /* PS mode d->e. All functions are active */ 1009 /* PS mode d->e. All functions are active */
1012 hdmi_write(hdmi, 0x80, HDMI_SYSTEM_CTRL); 1010 hdmi_write(hdmi, 0x80, HDMI_SYSTEM_CTRL);
1013 dev_dbg(hdmi->dev, "HDMI running\n"); 1011 dev_dbg(hdmi->dev, "HDMI running\n");
1014 break;
1015 default:
1016 fb_var_to_videomode(&hdmi->mode, &ch->display_var);
1017 break;
1018 } 1012 }
1019 1013
1020 return hdmi->hp_state == HDMI_HOTPLUG_DISCONNECTED 1014 return hdmi->hp_state == HDMI_HOTPLUG_DISCONNECTED