openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/omap: convert dss_mgr_disable to accept omap_channel 

We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_disable() to accept 'enum omap_channel' instead of
'struct omap_overlay_manager'.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2015-11-04 20:28:45 +02:00
parent 85a8c62250
commit 705fd454a9
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/omapdrm/dss/dispc-compat.c
View File

@ -379,7 +379,7 @@ static void dispc_error_worker(struct work_struct *work)
"with video overlays disabled\n", "with video overlays disabled\n",
mgr->name); mgr->name);
dss_mgr_disable(mgr); dss_mgr_disable(mgr->id);
for (j = 0; j < omap_dss_get_num_overlays(); ++j) { for (j = 0; j < omap_dss_get_num_overlays(); ++j) {
struct omap_overlay *ovl; struct omap_overlay *ovl;
@ -400,7 +400,7 @@ static void dispc_error_worker(struct work_struct *work)
struct omap_overlay_manager *mgr; struct omap_overlay_manager *mgr;
mgr = omap_dss_get_overlay_manager(i); mgr = omap_dss_get_overlay_manager(i);
dss_mgr_disable(mgr); dss_mgr_disable(mgr->id);
} }
} }

2
drivers/gpu/drm/omapdrm/dss/dpi.c
View File

@ -461,7 +461,7 @@ static void dpi_display_disable(struct omap_dss_device *dssdev)
mutex_lock(&dpi->lock); mutex_lock(&dpi->lock);
dss_mgr_disable(mgr); dss_mgr_disable(mgr->id);
if (dpi->pll) { if (dpi->pll) {
dss_select_lcd_clk_source(mgr->id, OMAP_DSS_CLK_SRC_FCK); dss_select_lcd_clk_source(mgr->id, OMAP_DSS_CLK_SRC_FCK);

2
drivers/gpu/drm/omapdrm/dss/dsi.c
View File

@ -3910,7 +3910,7 @@ static void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel
dsi_if_enable(dsidev, true); dsi_if_enable(dsidev, true);
} }
dss_mgr_disable(mgr); dss_mgr_disable(mgr->id);
dsi_display_uninit_dispc(dsidev, mgr); dsi_display_uninit_dispc(dsidev, mgr);
} }

4
drivers/gpu/drm/omapdrm/dss/hdmi4.c
View File

@ -233,7 +233,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
return 0; return 0;
err_vid_enable: err_vid_enable:
dss_mgr_disable(mgr); dss_mgr_disable(mgr->id);
err_mgr_enable: err_mgr_enable:
hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF); hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
err_phy_pwr: err_phy_pwr:
@ -253,7 +253,7 @@ static void hdmi_power_off_full(struct omap_dss_device *dssdev)
hdmi_wp_video_stop(&hdmi.wp); hdmi_wp_video_stop(&hdmi.wp);
dss_mgr_disable(mgr); dss_mgr_disable(mgr->id);
hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF); hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);

4
drivers/gpu/drm/omapdrm/dss/hdmi5.c
View File

@ -250,7 +250,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
return 0; return 0;
err_vid_enable: err_vid_enable:
dss_mgr_disable(mgr); dss_mgr_disable(mgr->id);
err_mgr_enable: err_mgr_enable:
hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF); hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
err_phy_pwr: err_phy_pwr:
@ -270,7 +270,7 @@ static void hdmi_power_off_full(struct omap_dss_device *dssdev)
hdmi_wp_video_stop(&hdmi.wp); hdmi_wp_video_stop(&hdmi.wp);
dss_mgr_disable(mgr); dss_mgr_disable(mgr->id);
hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF); hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);

2
drivers/gpu/drm/omapdrm/dss/omapdss.h
View File

@ -91,7 +91,7 @@ void dss_mgr_set_timings(enum omap_channel channel,
void dss_mgr_set_lcd_config(enum omap_channel channel, void dss_mgr_set_lcd_config(enum omap_channel channel,
const struct dss_lcd_mgr_config *config); const struct dss_lcd_mgr_config *config);
int dss_mgr_enable(enum omap_channel channel); int dss_mgr_enable(enum omap_channel channel);
void dss_mgr_disable(struct omap_overlay_manager *mgr); void dss_mgr_disable(enum omap_channel channel);
void dss_mgr_start_update(struct omap_overlay_manager *mgr); void dss_mgr_start_update(struct omap_overlay_manager *mgr);
int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr, int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr,
void (*handler)(void *), void *data); void (*handler)(void *), void *data);

4
drivers/gpu/drm/omapdrm/dss/output.c
View File

@ -222,9 +222,9 @@ int dss_mgr_enable(enum omap_channel channel)
} }
EXPORT_SYMBOL(dss_mgr_enable); EXPORT_SYMBOL(dss_mgr_enable);
void dss_mgr_disable(struct omap_overlay_manager *mgr) void dss_mgr_disable(enum omap_channel channel)
{ {
dss_mgr_ops->disable(mgr->id); dss_mgr_ops->disable(channel);
} }
EXPORT_SYMBOL(dss_mgr_disable); EXPORT_SYMBOL(dss_mgr_disable);

2
drivers/gpu/drm/omapdrm/dss/sdi.c
View File

@ -218,7 +218,7 @@ static void sdi_display_disable(struct omap_dss_device *dssdev)
{ {
struct omap_overlay_manager *mgr = sdi.output.manager; struct omap_overlay_manager *mgr = sdi.output.manager;
dss_mgr_disable(mgr); dss_mgr_disable(mgr->id);
dss_sdi_disable(); dss_sdi_disable();

2
drivers/gpu/drm/omapdrm/dss/venc.c
View File

@ -499,7 +499,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);
dss_mgr_disable(mgr); dss_mgr_disable(mgr->id);
regulator_disable(venc.vdda_dac_reg); regulator_disable(venc.vdda_dac_reg);