summaryrefslogtreecommitdiffstats
path: root/drivers/video/sh_mobile_hdmi.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2010-09-03 07:20:27 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-09-14 17:23:26 +0900
commit1c120deb60edd4c19a2109daa98f65f2ad3b9c06 (patch)
tree6aa09f9a016d229c512e118ddd0157f77e68af20 /drivers/video/sh_mobile_hdmi.c
parent6de9edd5bde0cdfea12e9948690e53ec669c3018 (diff)
downloadop-kernel-dev-1c120deb60edd4c19a2109daa98f65f2ad3b9c06.zip
op-kernel-dev-1c120deb60edd4c19a2109daa98f65f2ad3b9c06.tar.gz
fbdev: sh_mobile_lcdcfb: separate display variable data from framebuffer data
This is a preparation for a patch, that shall allow displaying of a smaller framebuffer on a bigger display and of a part of a bigger framebuffer on a smaller display. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/sh_mobile_hdmi.c')
-rw-r--r--drivers/video/sh_mobile_hdmi.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index 56e44fd..51ce349 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -732,6 +732,7 @@ static void hdmi_display_on(void *arg, struct fb_info *info)
*/
struct sh_hdmi *hdmi = arg;
struct sh_mobile_hdmi_info *pdata = hdmi->dev->platform_data;
+ struct sh_mobile_lcdc_chan *ch = info->par;
pr_debug("%s(%p): state %x\n", __func__, pdata->lcd_dev, info->state);
@@ -747,7 +748,7 @@ static void hdmi_display_on(void *arg, struct fb_info *info)
case HDMI_HOTPLUG_DISCONNECTED:
info->state = FBINFO_STATE_SUSPENDED;
default:
- hdmi->var = info->var;
+ hdmi->var = ch->display_var;
}
}
@@ -767,6 +768,7 @@ static void edid_work_fn(struct work_struct *work)
{
struct sh_hdmi *hdmi = container_of(work, struct sh_hdmi, edid_work.work);
struct sh_mobile_hdmi_info *pdata = hdmi->dev->platform_data;
+ struct sh_mobile_lcdc_chan *ch;
pr_debug("%s(%p): begin, hotplug status %d\n", __func__,
pdata->lcd_dev, hdmi->hp_state);
@@ -788,10 +790,12 @@ static void edid_work_fn(struct work_struct *work)
if (!hdmi->info)
goto out;
+ ch = hdmi->info->par;
+
acquire_console_sem();
/* HDMI plug in */
- hdmi->info->var = hdmi->var;
+ ch->display_var = hdmi->var;
if (hdmi->info->state != FBINFO_STATE_RUNNING) {
fb_set_suspend(hdmi->info, 0);
} else {
OpenPOWER on IntegriCloud