summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/dc.c
diff options
context:
space:
mode:
authorJon Mayo <jmayo@nvidia.com>2012-03-27 17:18:48 -0700
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-03-30 09:32:03 -0700
commit9f37229347b62d04999b0ade874eeae3ac4b731e (patch)
treed0cbc332c2c5ae420d30bc53635f8b89d0a1e014 /drivers/video/tegra/dc/dc.c
parent0ca5b5ac49fe5b49274e622ec17beac5dac97d11 (diff)
video: tegra: dc: remove obsolete overlay interface
Remove old overlay interface, it is replaced with TEGRA_DC_EXTENSIONS External functions made static now that overlay.c no longer needs them. Change-Id: I5d080ceb19ad90d3b5cc4bf20494c967687293a5 Signed-off-by: Jon Mayo <jmayo@nvidia.com> Reviewed-on: http://git-master/r/92661 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Chao Xu <cxu@nvidia.com> Reviewed-by: Robert Morell <rmorell@nvidia.com> Reviewed-by: Kevin Huang (Eng-SW) <kevinh@nvidia.com> Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com> Reviewed-by: Michael I Gold <gold@nvidia.com> Reviewed-by: Markus Holtmanns <mholtmanns@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/dc.c')
-rw-r--r--drivers/video/tegra/dc/dc.c22
1 files changed, 3 insertions, 19 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 3d09a13..8b3bf04 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -49,7 +49,6 @@
#include "dc_reg.h"
#include "dc_priv.h"
-#include "overlay.h"
#include "nvsd.h"
#define TEGRA_CRC_LATCHED_DELAY 34
@@ -519,7 +518,7 @@ out:
return ret;
}
-unsigned int tegra_dc_has_multiple_dc(void)
+static unsigned int tegra_dc_has_multiple_dc(void)
{
unsigned int idx;
unsigned int cnt = 0;
@@ -962,7 +961,8 @@ static unsigned long tegra_dc_calc_win_bandwidth(struct tegra_dc *dc,
return ret << 16; /* restore the scaling we did above */
}
-unsigned long tegra_dc_get_bandwidth(struct tegra_dc_win *windows[], int n)
+static unsigned long tegra_dc_get_bandwidth(
+ struct tegra_dc_win *windows[], int n)
{
int i;
@@ -2665,9 +2665,6 @@ static void _tegra_dc_disable(struct tegra_dc *dc)
void tegra_dc_disable(struct tegra_dc *dc)
{
- if (dc->overlay)
- tegra_overlay_disable(dc->overlay);
-
tegra_dc_ext_disable(dc->ext);
/* it's important that new underflow work isn't scheduled before the
@@ -2946,12 +2943,6 @@ static int tegra_dc_probe(struct nvhost_device *ndev)
dc->fb = NULL;
}
- if (dc->fb) {
- dc->overlay = tegra_overlay_register(ndev, dc);
- if (IS_ERR_OR_NULL(dc->overlay))
- dc->overlay = NULL;
- }
-
if (dc->out && dc->out->hotplug_init)
dc->out->hotplug_init();
@@ -2989,10 +2980,6 @@ static int tegra_dc_remove(struct nvhost_device *ndev)
tegra_dc_remove_sysfs(&dc->ndev->dev);
tegra_dc_remove_debugfs(dc);
- if (dc->overlay) {
- tegra_overlay_unregister(dc->overlay);
- }
-
if (dc->fb) {
tegra_fb_unregister(dc->fb);
if (dc->fb_mem)
@@ -3028,9 +3015,6 @@ static int tegra_dc_suspend(struct nvhost_device *ndev, pm_message_t state)
dev_info(&ndev->dev, "suspend\n");
- if (dc->overlay)
- tegra_overlay_disable(dc->overlay);
-
tegra_dc_ext_disable(dc->ext);
mutex_lock(&dc->lock);