mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-12 00:38:55 +00:00
Merge branch 'for-3.3-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-for-linus
This commit is contained in:
commit
4761c603dd
@ -165,9 +165,25 @@ static int hdmi_runtime_get(void)
|
||||
|
||||
DSSDBG("hdmi_runtime_get\n");
|
||||
|
||||
/*
|
||||
* HACK: Add dss_runtime_get() to ensure DSS clock domain is enabled.
|
||||
* This should be removed later.
|
||||
*/
|
||||
r = dss_runtime_get();
|
||||
if (r < 0)
|
||||
goto err_get_dss;
|
||||
|
||||
r = pm_runtime_get_sync(&hdmi.pdev->dev);
|
||||
WARN_ON(r < 0);
|
||||
return r < 0 ? r : 0;
|
||||
if (r < 0)
|
||||
goto err_get_hdmi;
|
||||
|
||||
return 0;
|
||||
|
||||
err_get_hdmi:
|
||||
dss_runtime_put();
|
||||
err_get_dss:
|
||||
return r;
|
||||
}
|
||||
|
||||
static void hdmi_runtime_put(void)
|
||||
@ -178,6 +194,12 @@ static void hdmi_runtime_put(void)
|
||||
|
||||
r = pm_runtime_put_sync(&hdmi.pdev->dev);
|
||||
WARN_ON(r < 0);
|
||||
|
||||
/*
|
||||
* HACK: This is added to complement the dss_runtime_get() call in
|
||||
* hdmi_runtime_get(). This should be removed later.
|
||||
*/
|
||||
dss_runtime_put();
|
||||
}
|
||||
|
||||
int hdmi_init_display(struct omap_dss_device *dssdev)
|
||||
|
@ -479,14 +479,7 @@ int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data,
|
||||
|
||||
bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data)
|
||||
{
|
||||
int r;
|
||||
|
||||
void __iomem *base = hdmi_core_sys_base(ip_data);
|
||||
|
||||
/* HPD */
|
||||
r = REG_GET(base, HDMI_CORE_SYS_SYS_STAT, 1, 1);
|
||||
|
||||
return r == 1;
|
||||
return gpio_get_value(ip_data->hpd_gpio);
|
||||
}
|
||||
|
||||
static void hdmi_core_init(struct hdmi_core_video_config *video_cfg,
|
||||
|
Loading…
x
Reference in New Issue
Block a user