hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fbdev: sh_mobile_hdmi: simplify pointer handling 

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Guennadi Liakhovetski 2011-01-07 11:58:03 +00:00 committed by Paul Mundt
parent eb0778bd3c
commit 0d7fa180a8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/video/sh_mobile_hdmi.c
View File

@ -878,9 +878,9 @@ static int sh_hdmi_read_edid(struct sh_hdmi *hdmi, unsigned long *hdmi_rate,
* driver, and passing ->info with HDMI platform data. * driver, and passing ->info with HDMI platform data.
*/ */
if (info && !found) { if (info && !found) {
modelist = hdmi->info->modelist.next && modelist = info->modelist.next &&
!list_empty(&hdmi->info->modelist) ? !list_empty(&info->modelist) ?
list_entry(hdmi->info->modelist.next, list_entry(info->modelist.next,
struct fb_modelist, list) : struct fb_modelist, list) :
NULL; NULL;
@ -1123,6 +1123,7 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work)
mutex_lock(&hdmi->mutex); mutex_lock(&hdmi->mutex);
if (hdmi->hp_state == HDMI_HOTPLUG_CONNECTED) { if (hdmi->hp_state == HDMI_HOTPLUG_CONNECTED) {
struct fb_info *info = hdmi->info;
unsigned long parent_rate = 0, hdmi_rate; unsigned long parent_rate = 0, hdmi_rate;
/* A device has been plugged in */ /* A device has been plugged in */
@ -1144,22 +1145,21 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work)
/* Switched to another (d) power-save mode */ /* Switched to another (d) power-save mode */
msleep(10); msleep(10);
if (!hdmi->info) if (!info)
goto out; goto out;
ch = hdmi->info->par; ch = info->par;
acquire_console_sem(); acquire_console_sem();
/* HDMI plug in */ /* HDMI plug in */
if (!sh_hdmi_must_reconfigure(hdmi) && if (!sh_hdmi_must_reconfigure(hdmi) &&
hdmi->info->state == FBINFO_STATE_RUNNING) { info->state == FBINFO_STATE_RUNNING) {
/* /*
* First activation with the default monitor - just turn * First activation with the default monitor - just turn
* on, if we run a resume here, the logo disappears * on, if we run a resume here, the logo disappears
*/ */
if (lock_fb_info(hdmi->info)) { if (lock_fb_info(info)) {
struct fb_info *info = hdmi->info;
info->var.width = hdmi->var.width; info->var.width = hdmi->var.width;
info->var.height = hdmi->var.height; info->var.height = hdmi->var.height;
sh_hdmi_display_on(hdmi, info); sh_hdmi_display_on(hdmi, info);
@ -1167,7 +1167,7 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work)
} }
} else { } else {
/* New monitor or have to wake up */ /* New monitor or have to wake up */
fb_set_suspend(hdmi->info, 0); fb_set_suspend(info, 0);
} }
release_console_sem(); release_console_sem();