|
@@ -9,6 +9,7 @@
|
|
|
#include <asm/io.h>
|
|
|
#include <asm/arch/tegra.h>
|
|
|
#include <asm/arch/mc.h>
|
|
|
+#include <asm/arch-tegra/ap.h>
|
|
|
|
|
|
#include <fdt_support.h>
|
|
|
|
|
@@ -18,12 +19,17 @@ void tegra_gpu_config(void)
|
|
|
{
|
|
|
struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE;
|
|
|
|
|
|
- /* Turn VPR off */
|
|
|
- writel(0, &mc->mc_video_protect_size_mb);
|
|
|
- writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED,
|
|
|
- &mc->mc_video_protect_reg_ctrl);
|
|
|
- /* read back to ensure the write went through */
|
|
|
- readl(&mc->mc_video_protect_reg_ctrl);
|
|
|
+#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
|
|
|
+ if (!tegra_cpu_is_non_secure())
|
|
|
+#endif
|
|
|
+ {
|
|
|
+ /* Turn VPR off */
|
|
|
+ writel(0, &mc->mc_video_protect_size_mb);
|
|
|
+ writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED,
|
|
|
+ &mc->mc_video_protect_reg_ctrl);
|
|
|
+ /* read back to ensure the write went through */
|
|
|
+ readl(&mc->mc_video_protect_reg_ctrl);
|
|
|
+ }
|
|
|
|
|
|
debug("configured VPR\n");
|
|
|
|