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

drm: omapdrm: Rename CRTC DSS operations with an omap_crtc_dss_ prefix 

The omap_crtc_enable() and omap_crtc_disable() DSS operations functions
will clash with the new CRTC enable and disable helpers. Rename them to
omap_crtc_dss_*, as well as the other DSS operations for consistency.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Laurent Pinchart 2015-03-05 22:01:02 +02:00
parent 2d278f5414
commit 4343f0f857
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/gpu/drm/omapdrm/omap_crtc.c
View File

@ -131,7 +131,7 @@ enum omap_channel omap_crtc_channel(struct drm_crtc *crtc)
static struct omap_crtc *omap_crtcs[8]; static struct omap_crtc *omap_crtcs[8];
/* we can probably ignore these until we support command-mode panels: */ /* we can probably ignore these until we support command-mode panels: */
static int omap_crtc_connect(struct omap_overlay_manager *mgr, static int omap_crtc_dss_connect(struct omap_overlay_manager *mgr,
struct omap_dss_device *dst) struct omap_dss_device *dst)
{ {
if (mgr->output) if (mgr->output)
@ -146,14 +146,14 @@ static int omap_crtc_connect(struct omap_overlay_manager *mgr,
return 0; return 0;
} }
static void omap_crtc_disconnect(struct omap_overlay_manager *mgr, static void omap_crtc_dss_disconnect(struct omap_overlay_manager *mgr,
struct omap_dss_device *dst) struct omap_dss_device *dst)
{ {
mgr->output->manager = NULL; mgr->output->manager = NULL;
mgr->output = NULL; mgr->output = NULL;
} }
static void omap_crtc_start_update(struct omap_overlay_manager *mgr) static void omap_crtc_dss_start_update(struct omap_overlay_manager *mgr)
{ {
} }
@ -215,7 +215,7 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
} }
static int omap_crtc_enable(struct omap_overlay_manager *mgr) static int omap_crtc_dss_enable(struct omap_overlay_manager *mgr)
{ {
struct omap_crtc *omap_crtc = omap_crtcs[mgr->id]; struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
@ -227,14 +227,14 @@ static int omap_crtc_enable(struct omap_overlay_manager *mgr)
return 0; return 0;
} }
static void omap_crtc_disable(struct omap_overlay_manager *mgr) static void omap_crtc_dss_disable(struct omap_overlay_manager *mgr)
{ {
struct omap_crtc *omap_crtc = omap_crtcs[mgr->id]; struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
omap_crtc_set_enabled(&omap_crtc->base, false); omap_crtc_set_enabled(&omap_crtc->base, false);
} }
static void omap_crtc_set_timings(struct omap_overlay_manager *mgr, static void omap_crtc_dss_set_timings(struct omap_overlay_manager *mgr,
const struct omap_video_timings *timings) const struct omap_video_timings *timings)
{ {
struct omap_crtc *omap_crtc = omap_crtcs[mgr->id]; struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
@ -242,7 +242,7 @@ static void omap_crtc_set_timings(struct omap_overlay_manager *mgr,
omap_crtc->timings = *timings; omap_crtc->timings = *timings;
} }
static void omap_crtc_set_lcd_config(struct omap_overlay_manager *mgr, static void omap_crtc_dss_set_lcd_config(struct omap_overlay_manager *mgr,
const struct dss_lcd_mgr_config *config) const struct dss_lcd_mgr_config *config)
{ {
struct omap_crtc *omap_crtc = omap_crtcs[mgr->id]; struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
@ -250,29 +250,29 @@ static void omap_crtc_set_lcd_config(struct omap_overlay_manager *mgr,
dispc_mgr_set_lcd_config(omap_crtc->channel, config); dispc_mgr_set_lcd_config(omap_crtc->channel, config);
} }
static int omap_crtc_register_framedone_handler( static int omap_crtc_dss_register_framedone(
struct omap_overlay_manager *mgr, struct omap_overlay_manager *mgr,
void (*handler)(void *), void *data) void (*handler)(void *), void *data)
{ {
return 0; return 0;
} }
static void omap_crtc_unregister_framedone_handler( static void omap_crtc_dss_unregister_framedone(
struct omap_overlay_manager *mgr, struct omap_overlay_manager *mgr,
void (*handler)(void *), void *data) void (*handler)(void *), void *data)
{ {
} }
static const struct dss_mgr_ops mgr_ops = { static const struct dss_mgr_ops mgr_ops = {
.connect = omap_crtc_connect, .connect = omap_crtc_dss_connect,
.disconnect = omap_crtc_disconnect, .disconnect = omap_crtc_dss_disconnect,
.start_update = omap_crtc_start_update, .start_update = omap_crtc_dss_start_update,
.enable = omap_crtc_enable, .enable = omap_crtc_dss_enable,
.disable = omap_crtc_disable, .disable = omap_crtc_dss_disable,
.set_timings = omap_crtc_set_timings, .set_timings = omap_crtc_dss_set_timings,
.set_lcd_config = omap_crtc_set_lcd_config, .set_lcd_config = omap_crtc_dss_set_lcd_config,
.register_framedone_handler = omap_crtc_register_framedone_handler, .register_framedone_handler = omap_crtc_dss_register_framedone,
.unregister_framedone_handler = omap_crtc_unregister_framedone_handler, .unregister_framedone_handler = omap_crtc_dss_unregister_framedone,
}; };
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------