evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OMAPDSS: hide manager's enable/disable()

Browse source 
omap_overlay_manager struct contains enable() and disable() functions.
However, these are only meant to be used from inside omapdss, and thus
it's bad to expose the functions.

This patch adds dss_mgr_enable() and dss_mgr_disable() functions to
apply.c, which handle enabling and disabling the output.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2011-11-04 10:22:46 +02:00
parent 58f2554807
commit 7797c6da64
9 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/video/omap2/dss/apply.c
View file

@ -424,7 +424,7 @@ void dss_mgr_start_update(struct omap_overlay_manager *mgr)
mc->shadow_dirty = false; mc->shadow_dirty = false;
} }
mgr->enable(mgr); dispc_mgr_enable(mgr->id, true);
} }
static void dss_apply_irq_handler(void *data, u32 mask) static void dss_apply_irq_handler(void *data, u32 mask)
@ -654,3 +654,13 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
return r; return r;
} }
void dss_mgr_enable(struct omap_overlay_manager *mgr)
{
dispc_mgr_enable(mgr->id, true);
}
void dss_mgr_disable(struct omap_overlay_manager *mgr)
{
dispc_mgr_enable(mgr->id, false);
}

4
drivers/video/omap2/dss/dpi.c
View file

@ -223,7 +223,7 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
mdelay(2); mdelay(2);
dssdev->manager->enable(dssdev->manager); dss_mgr_enable(dssdev->manager);
return 0; return 0;
@ -249,7 +249,7 @@ EXPORT_SYMBOL(omapdss_dpi_display_enable);
void omapdss_dpi_display_disable(struct omap_dss_device *dssdev) void omapdss_dpi_display_disable(struct omap_dss_device *dssdev)
{ {
dssdev->manager->disable(dssdev->manager); dss_mgr_disable(dssdev->manager);
if (dpi_use_dsi_pll(dssdev)) { if (dpi_use_dsi_pll(dssdev)) {
dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK); dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

4
drivers/video/omap2/dss/dsi.c
View file

@ -4010,7 +4010,7 @@ int dsi_video_mode_enable(struct omap_dss_device *dssdev, int channel)
dsi_vc_enable(dsidev, channel, true); dsi_vc_enable(dsidev, channel, true);
dsi_if_enable(dsidev, true); dsi_if_enable(dsidev, true);
dssdev->manager->enable(dssdev->manager); dss_mgr_enable(dssdev->manager);
return 0; return 0;
} }
@ -4029,7 +4029,7 @@ void dsi_video_mode_disable(struct omap_dss_device *dssdev, int channel)
dsi_vc_enable(dsidev, channel, true); dsi_vc_enable(dsidev, channel, true);
dsi_if_enable(dsidev, true); dsi_if_enable(dsidev, true);
dssdev->manager->disable(dssdev->manager); dss_mgr_disable(dssdev->manager);
} }
EXPORT_SYMBOL(dsi_video_mode_disable); EXPORT_SYMBOL(dsi_video_mode_disable);

2
drivers/video/omap2/dss/dss.h
View file

@ -169,6 +169,8 @@ int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr);
int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl); int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl);
void dss_mgr_start_update(struct omap_overlay_manager *mgr); void dss_mgr_start_update(struct omap_overlay_manager *mgr);
int omap_dss_mgr_apply(struct omap_overlay_manager *mgr); int omap_dss_mgr_apply(struct omap_overlay_manager *mgr);
void dss_mgr_enable(struct omap_overlay_manager *mgr);
void dss_mgr_disable(struct omap_overlay_manager *mgr);
/* display */ /* display */
int dss_suspend_all_devices(void); int dss_suspend_all_devices(void);

6
drivers/video/omap2/dss/hdmi.c
View file

@ -333,7 +333,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
if (r) if (r)
return r; return r;
dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 0); dss_mgr_disable(dssdev->manager);
p = &dssdev->panel.timings; p = &dssdev->panel.timings;
@ -387,7 +387,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 1); hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 1);
dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 1); dss_mgr_enable(dssdev->manager);
return 0; return 0;
err: err:
@ -397,7 +397,7 @@ err:
static void hdmi_power_off(struct omap_dss_device *dssdev) static void hdmi_power_off(struct omap_dss_device *dssdev)
{ {
dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 0); dss_mgr_disable(dssdev->manager);
hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 0); hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 0);
hdmi.ip_data.ops->phy_disable(&hdmi.ip_data); hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);

15
drivers/video/omap2/dss/manager.c
View file

@ -585,18 +585,6 @@ static void omap_dss_mgr_get_info(struct omap_overlay_manager *mgr,
*info = mgr->info; *info = mgr->info;
} }
static int dss_mgr_enable(struct omap_overlay_manager *mgr)
{
dispc_mgr_enable(mgr->id, 1);
return 0;
}
static int dss_mgr_disable(struct omap_overlay_manager *mgr)
{
dispc_mgr_enable(mgr->id, 0);
return 0;
}
static void omap_dss_add_overlay_manager(struct omap_overlay_manager *manager) static void omap_dss_add_overlay_manager(struct omap_overlay_manager *manager)
{ {
++num_managers; ++num_managers;
@ -640,9 +628,6 @@ int dss_init_overlay_managers(struct platform_device *pdev)
mgr->wait_for_go = &dss_mgr_wait_for_go; mgr->wait_for_go = &dss_mgr_wait_for_go;
mgr->wait_for_vsync = &dss_mgr_wait_for_vsync; mgr->wait_for_vsync = &dss_mgr_wait_for_vsync;
mgr->enable = &dss_mgr_enable;
mgr->disable = &dss_mgr_disable;
mgr->caps = 0; mgr->caps = 0;
mgr->supported_displays = mgr->supported_displays =
dss_feat_get_supported_displays(mgr->id); dss_feat_get_supported_displays(mgr->id);

4
drivers/video/omap2/dss/sdi.c
View file

@ -123,7 +123,7 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
goto err_sdi_enable; goto err_sdi_enable;
mdelay(2); mdelay(2);
dssdev->manager->enable(dssdev->manager); dss_mgr_enable(dssdev->manager);
return 0; return 0;
@ -145,7 +145,7 @@ EXPORT_SYMBOL(omapdss_sdi_display_enable);
void omapdss_sdi_display_disable(struct omap_dss_device *dssdev) void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
{ {
dssdev->manager->disable(dssdev->manager); dss_mgr_disable(dssdev->manager);
dss_sdi_disable(); dss_sdi_disable();

4
drivers/video/omap2/dss/venc.c
View file

@ -447,7 +447,7 @@ static void venc_power_on(struct omap_dss_device *dssdev)
if (dssdev->platform_enable) if (dssdev->platform_enable)
dssdev->platform_enable(dssdev); dssdev->platform_enable(dssdev);
dssdev->manager->enable(dssdev->manager); dss_mgr_enable(dssdev->manager);
} }
static void venc_power_off(struct omap_dss_device *dssdev) static void venc_power_off(struct omap_dss_device *dssdev)
@ -455,7 +455,7 @@ static void venc_power_off(struct omap_dss_device *dssdev)
venc_write_reg(VENC_OUTPUT_CONTROL, 0); venc_write_reg(VENC_OUTPUT_CONTROL, 0);
dss_set_dac_pwrdn_bgz(0); dss_set_dac_pwrdn_bgz(0);
dssdev->manager->disable(dssdev->manager); dss_mgr_disable(dssdev->manager);
if (dssdev->platform_disable) if (dssdev->platform_disable)
dssdev->platform_disable(dssdev); dssdev->platform_disable(dssdev);

3
include/video/omapdss.h
View file

@ -448,9 +448,6 @@ struct omap_overlay_manager {
int (*apply)(struct omap_overlay_manager *mgr); int (*apply)(struct omap_overlay_manager *mgr);
int (*wait_for_go)(struct omap_overlay_manager *mgr); int (*wait_for_go)(struct omap_overlay_manager *mgr);
int (*wait_for_vsync)(struct omap_overlay_manager *mgr); int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
int (*enable)(struct omap_overlay_manager *mgr);
int (*disable)(struct omap_overlay_manager *mgr);
}; };
struct omap_dss_device { struct omap_dss_device {