diff options
Diffstat (limited to 'drivers/video/tegra/dc/dc_priv.h')
| -rw-r--r-- | drivers/video/tegra/dc/dc_priv.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/video/tegra/dc/dc_priv.h b/drivers/video/tegra/dc/dc_priv.h index ac3a5d341e18..19c8656689d1 100644 --- a/drivers/video/tegra/dc/dc_priv.h +++ b/drivers/video/tegra/dc/dc_priv.h @@ -24,11 +24,10 @@ #include <linux/fb.h> #include <linux/completion.h> #include <linux/switch.h> +#include <linux/nvhost.h> #include <mach/dc.h> -#include "../host/nvhost_acm.h" - #include <mach/tegra_dc_ext.h> #include <mach/clk.h> @@ -150,12 +149,12 @@ struct tegra_dc { static inline void tegra_dc_io_start(struct tegra_dc *dc) { - nvhost_module_busy(to_nvhost_device(dc->ndev->dev.parent)); + nvhost_module_busy_ext(nvhost_get_parent(dc->ndev)); } static inline void tegra_dc_io_end(struct tegra_dc *dc) { - nvhost_module_idle(to_nvhost_device(dc->ndev->dev.parent)); + nvhost_module_idle_ext(nvhost_get_parent(dc->ndev)); } static inline unsigned long tegra_dc_readl(struct tegra_dc *dc, @@ -163,7 +162,7 @@ static inline unsigned long tegra_dc_readl(struct tegra_dc *dc, { unsigned long ret; - BUG_ON(!nvhost_module_powered(to_nvhost_device(dc->ndev->dev.parent))); + BUG_ON(!nvhost_module_powered_ext(nvhost_get_parent(dc->ndev))); if (!tegra_is_clk_enabled(dc->clk)) WARN(1, "DC is clock-gated.\n"); @@ -175,7 +174,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(to_nvhost_device(dc->ndev->dev.parent))); + BUG_ON(!nvhost_module_powered_ext(nvhost_get_parent(dc->ndev))); if (!tegra_is_clk_enabled(dc->clk)) WARN(1, "DC is clock-gated.\n"); @@ -206,7 +205,7 @@ static inline void *tegra_dc_get_outdata(struct tegra_dc *dc) } static inline unsigned long tegra_dc_get_default_emc_clk_rate( - struct tegra_dc *dc) + struct tegra_dc *dc) { return dc->pdata->emc_clk_rate ? dc->pdata->emc_clk_rate : ULONG_MAX; } |