public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fbdev: sh_mobile_hdmi: Don't access LCDC fb_info

Browse source 
The LCDC fb_info structure is only used to retrieve the default video
mode in case none of the modes advertised by EDID information is
acceptable. Pass a pointer to the default mode through the
sh_mobile_lcdc_entity structure instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2011-11-29 01:46:12 +01:00
parent d30555d24e
commit 13f80eea56
3 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/video/sh_mobile_hdmi.c
View file

@ -734,12 +734,11 @@ static int sh_hdmi_read_edid(struct sh_hdmi *hdmi, unsigned long *hdmi_rate,
unsigned long *parent_rate) unsigned long *parent_rate)
{ {
struct sh_mobile_lcdc_chan *ch = hdmi->entity.lcdc; struct sh_mobile_lcdc_chan *ch = hdmi->entity.lcdc;
struct fb_info *info = ch ? ch->info : NULL;
const struct fb_videomode *mode, *found = NULL; const struct fb_videomode *mode, *found = NULL;
const struct fb_modelist *modelist = NULL;
unsigned int f_width = 0, f_height = 0, f_refresh = 0; unsigned int f_width = 0, f_height = 0, f_refresh = 0;
unsigned long found_rate_error = ULONG_MAX; /* silly compiler... */ unsigned long found_rate_error = ULONG_MAX; /* silly compiler... */
bool scanning = false, preferred_bad = false; bool scanning = false, preferred_bad = false;
bool use_edid_mode = false;
u8 edid[128]; u8 edid[128];
char *forced; char *forced;
int i; int i;
@ -864,25 +863,19 @@ static int sh_hdmi_read_edid(struct sh_hdmi *hdmi, unsigned long *hdmi_rate,
found = mode; found = mode;
found_rate_error = rate_error; found_rate_error = rate_error;
use_edid_mode = true;
} }
/* /*
* TODO 1: if no ->info is present, postpone running the config until * TODO 1: if no default mode is present, postpone running the config
* after ->info first gets registered. * until after the LCDC channel is initialized.
* TODO 2: consider registering the HDMI platform device from the LCDC * TODO 2: consider registering the HDMI platform device from the LCDC
* driver, and passing ->info with HDMI platform data. * driver.
*/ */
if (info && !found) { if (!found && hdmi->entity.def_mode.xres != 0) {
modelist = info->modelist.next && found = &hdmi->entity.def_mode;
!list_empty(&info->modelist) ? found_rate_error = sh_hdmi_rate_error(hdmi, found, hdmi_rate,
list_entry(info->modelist.next, parent_rate);
struct fb_modelist, list) :
NULL;
if (modelist) {
found = &modelist->mode;
found_rate_error = sh_hdmi_rate_error(hdmi, found, hdmi_rate, parent_rate);
}
} }
/* No cookie today */ /* No cookie today */
@ -906,10 +899,11 @@ static int sh_hdmi_read_edid(struct sh_hdmi *hdmi, unsigned long *hdmi_rate,
else else
hdmi->preprogrammed_vic = 0; hdmi->preprogrammed_vic = 0;
dev_dbg(hdmi->dev, "Using %s %s mode %ux%u@%uHz (%luHz), clock error %luHz\n", dev_dbg(hdmi->dev, "Using %s %s mode %ux%u@%uHz (%luHz), "
modelist ? "default" : "EDID", hdmi->preprogrammed_vic ? "VIC" : "external", "clock error %luHz\n", use_edid_mode ? "EDID" : "default",
found->xres, found->yres, found->refresh, hdmi->preprogrammed_vic ? "VIC" : "external", found->xres,
PICOS2KHZ(found->pixclock) * 1000, found_rate_error); found->yres, found->refresh, PICOS2KHZ(found->pixclock) * 1000,
found_rate_error);
hdmi->mode = *found; hdmi->mode = *found;
sh_hdmi_external_video_param(hdmi); sh_hdmi_external_video_param(hdmi);

24
drivers/video/sh_mobile_lcdcfb.c
View file

@ -1691,17 +1691,6 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_priv *priv,
info->pseudo_palette = &ch->pseudo_palette; info->pseudo_palette = &ch->pseudo_palette;
info->flags = FBINFO_FLAG_DEFAULT; info->flags = FBINFO_FLAG_DEFAULT;
if (cfg->tx_dev) {
if (!cfg->tx_dev->dev.driver ||
!try_module_get(cfg->tx_dev->dev.driver->owner)) {
dev_warn(priv->dev,
"unable to get transmitter device\n");
return -EINVAL;
}
ch->tx_dev = platform_get_drvdata(cfg->tx_dev);
ch->tx_dev->lcdc = ch;
}
/* Iterate through the modes to validate them and find the highest /* Iterate through the modes to validate them and find the highest
* resolution. * resolution.
*/ */
@ -1742,6 +1731,19 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_priv *priv,
fb_videomode_to_modelist(mode, num_cfg, &info->modelist); fb_videomode_to_modelist(mode, num_cfg, &info->modelist);
/* Initialize the transmitter device if present. */
if (cfg->tx_dev) {
if (!cfg->tx_dev->dev.driver ||
!try_module_get(cfg->tx_dev->dev.driver->owner)) {
dev_warn(priv->dev,
"unable to get transmitter device\n");
return -EINVAL;
}
ch->tx_dev = platform_get_drvdata(cfg->tx_dev);
ch->tx_dev->lcdc = ch;
ch->tx_dev->def_mode = *mode;
}
/* Initialize variable screen information using the first mode as /* Initialize variable screen information using the first mode as
* default. The default Y virtual resolution is twice the panel size to * default. The default Y virtual resolution is twice the panel size to
* allow for double-buffering. * allow for double-buffering.

1
drivers/video/sh_mobile_lcdcfb.h
View file

@ -40,6 +40,7 @@ struct sh_mobile_lcdc_entity {
struct module *owner; struct module *owner;
const struct sh_mobile_lcdc_entity_ops *ops; const struct sh_mobile_lcdc_entity_ops *ops;
struct sh_mobile_lcdc_chan *lcdc; struct sh_mobile_lcdc_chan *lcdc;
struct fb_videomode def_mode;
}; };
/* /*