diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-02-22 11:22:30 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-03-03 10:38:24 -0500 |
| commit | 3bce5f4310dcec379e0b33cd1404456fda6f548e (patch) | |
| tree | c883e992c2bb13874407dddadc35bed615f2a03f /drivers/gpu/drm/omapdrm/dss | |
| parent | 9198891b4e1d336a77137a9327de05acc10896e2 (diff) | |
drm/omap: remove dispc_ovl_check()
dispc_ovl_check() is not used anywhere, so it can be removed.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dispc.c | 41 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/omapdss.h | 5 |
2 files changed, 0 insertions, 46 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c index 031451b09922..f83608b69e68 100644 --- a/drivers/gpu/drm/omapdrm/dss/dispc.c +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c | |||
| @@ -2561,47 +2561,6 @@ static int dispc_ovl_calc_scaling(unsigned long pclk, unsigned long lclk, | |||
| 2561 | return 0; | 2561 | return 0; |
| 2562 | } | 2562 | } |
| 2563 | 2563 | ||
| 2564 | int dispc_ovl_check(enum omap_plane plane, enum omap_channel channel, | ||
| 2565 | const struct omap_overlay_info *oi, | ||
| 2566 | const struct omap_video_timings *timings, | ||
| 2567 | int *x_predecim, int *y_predecim) | ||
| 2568 | { | ||
| 2569 | enum omap_overlay_caps caps = dss_feat_get_overlay_caps(plane); | ||
| 2570 | bool five_taps = true; | ||
| 2571 | bool fieldmode = false; | ||
| 2572 | u16 in_height = oi->height; | ||
| 2573 | u16 in_width = oi->width; | ||
| 2574 | bool ilace = timings->interlace; | ||
| 2575 | u16 out_width, out_height; | ||
| 2576 | int pos_x = oi->pos_x; | ||
| 2577 | unsigned long pclk = dispc_mgr_pclk_rate(channel); | ||
| 2578 | unsigned long lclk = dispc_mgr_lclk_rate(channel); | ||
| 2579 | |||
| 2580 | out_width = oi->out_width == 0 ? oi->width : oi->out_width; | ||
| 2581 | out_height = oi->out_height == 0 ? oi->height : oi->out_height; | ||
| 2582 | |||
| 2583 | if (ilace && oi->height == out_height) | ||
| 2584 | fieldmode = true; | ||
| 2585 | |||
| 2586 | if (ilace) { | ||
| 2587 | if (fieldmode) | ||
| 2588 | in_height /= 2; | ||
| 2589 | out_height /= 2; | ||
| 2590 | |||
| 2591 | DSSDBG("adjusting for ilace: height %d, out_height %d\n", | ||
| 2592 | in_height, out_height); | ||
| 2593 | } | ||
| 2594 | |||
| 2595 | if (!dss_feat_color_mode_supported(plane, oi->color_mode)) | ||
| 2596 | return -EINVAL; | ||
| 2597 | |||
| 2598 | return dispc_ovl_calc_scaling(pclk, lclk, caps, timings, in_width, | ||
| 2599 | in_height, out_width, out_height, oi->color_mode, | ||
| 2600 | &five_taps, x_predecim, y_predecim, pos_x, | ||
| 2601 | oi->rotation_type, false); | ||
| 2602 | } | ||
| 2603 | EXPORT_SYMBOL(dispc_ovl_check); | ||
| 2604 | |||
| 2605 | static int dispc_ovl_setup_common(enum omap_plane plane, | 2564 | static int dispc_ovl_setup_common(enum omap_plane plane, |
| 2606 | enum omap_overlay_caps caps, u32 paddr, u32 p_uv_addr, | 2565 | enum omap_overlay_caps caps, u32 paddr, u32 p_uv_addr, |
| 2607 | u16 screen_width, int pos_x, int pos_y, u16 width, u16 height, | 2566 | u16 screen_width, int pos_x, int pos_y, u16 width, u16 height, |
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 186d978e0120..d7e7c909bbc2 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h | |||
| @@ -45,11 +45,6 @@ void dispc_mgr_set_timings(enum omap_channel channel, | |||
| 45 | void dispc_mgr_setup(enum omap_channel channel, | 45 | void dispc_mgr_setup(enum omap_channel channel, |
| 46 | const struct omap_overlay_manager_info *info); | 46 | const struct omap_overlay_manager_info *info); |
| 47 | 47 | ||
| 48 | int dispc_ovl_check(enum omap_plane plane, enum omap_channel channel, | ||
| 49 | const struct omap_overlay_info *oi, | ||
| 50 | const struct omap_video_timings *timings, | ||
| 51 | int *x_predecim, int *y_predecim); | ||
| 52 | |||
| 53 | int dispc_ovl_enable(enum omap_plane plane, bool enable); | 48 | int dispc_ovl_enable(enum omap_plane plane, bool enable); |
| 54 | bool dispc_ovl_enabled(enum omap_plane plane); | 49 | bool dispc_ovl_enabled(enum omap_plane plane); |
| 55 | void dispc_ovl_set_channel_out(enum omap_plane plane, | 50 | void dispc_ovl_set_channel_out(enum omap_plane plane, |
