summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/dc_priv.h
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2012-06-12 13:44:15 +0300
committerSimone Willett <swillett@nvidia.com>2012-06-14 16:39:59 -0700
commit0e70f3c988b4d13c4c7d323428d444acbfb3f847 (patch)
tree5f32dd78c07acf267bb5b6f5b90eeab3037354b9 /drivers/video/tegra/dc/dc_priv.h
parentf2dd85f69f329f372db29d2e20d71f7e0e0f85bb (diff)
video: tegra: dc: Move #includes from dc_priv.h
Move #include directives for nvhost headers from dc_priv.h to the source files that need the #includes. This allows #including dc_priv.h without access to all nvhost headers. Also adds nvhost to the #include path of dc to allow making dev.h a stub in a later commit. Bug 982965 Change-Id: Icfe7084d295f57926195b178174f81047eb01187 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/108225 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/dc_priv.h')
-rw-r--r--drivers/video/tegra/dc/dc_priv.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/video/tegra/dc/dc_priv.h b/drivers/video/tegra/dc/dc_priv.h
index 351998683008..a2e77ebf3385 100644
--- a/drivers/video/tegra/dc/dc_priv.h
+++ b/drivers/video/tegra/dc/dc_priv.h
@@ -27,9 +27,7 @@
#include <mach/dc.h>
-#include "../host/dev.h"
#include "../host/nvhost_acm.h"
-#include "../host/host1x/host1x_syncpt.h"
#include <mach/tegra_dc_ext.h>
#include <mach/clk.h>
@@ -152,12 +150,12 @@ struct tegra_dc {
static inline void tegra_dc_io_start(struct tegra_dc *dc)
{
- nvhost_module_busy(nvhost_get_host(dc->ndev)->dev);
+ nvhost_module_busy(to_nvhost_device(dc->ndev->dev.parent));
}
static inline void tegra_dc_io_end(struct tegra_dc *dc)
{
- nvhost_module_idle(nvhost_get_host(dc->ndev)->dev);
+ nvhost_module_idle(to_nvhost_device(dc->ndev->dev.parent));
}
static inline unsigned long tegra_dc_readl(struct tegra_dc *dc,
@@ -165,7 +163,7 @@ static inline unsigned long tegra_dc_readl(struct tegra_dc *dc,
{
unsigned long ret;
- BUG_ON(!nvhost_module_powered(nvhost_get_host(dc->ndev)->dev));
+ BUG_ON(!nvhost_module_powered(to_nvhost_device(dc->ndev->dev.parent)));
if (!tegra_is_clk_enabled(dc->clk))
WARN(1, "DC is clock-gated.\n");
@@ -177,7 +175,7 @@ static inline unsigned long tegra_dc_readl(struct tegra_dc *dc,
static inline void tegra_dc_writel(struct tegra_dc *dc, unsigned long val,
unsigned long reg)
{
- BUG_ON(!nvhost_module_powered(nvhost_get_host(dc->ndev)->dev));
+ BUG_ON(!nvhost_module_powered(to_nvhost_device(dc->ndev->dev.parent)));
if (!tegra_is_clk_enabled(dc->clk))
WARN(1, "DC is clock-gated.\n");