From 1dde902b50dbc90fc77a58c536be175e6837995f Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 9 Nov 2015 10:23:02 -0800 Subject: Revert "gpu: nvgpu: gp10b: Force always SMMU bypass" This reverts commit cc9bd2dc24f562e97a87641e7436594fd3b469f2. Signed-off-by: Terje Bergstrom Change-Id: Ic4493bc7b71a2ebfb49644c91b34222dd15a9be1 Reviewed-on: http://git-master/r/830854 GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c index c08202ec..e7c55c97 100644 --- a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c @@ -95,7 +95,7 @@ static int gp10b_tegra_probe(struct platform_device *pdev) } platform->g->host1x_dev = host1x_pdev; - platform->bypass_smmu = 1; + platform->bypass_smmu = !device_is_iommuable(&pdev->dev); platform->disable_bigpage = platform->bypass_smmu; platform->g->gr.t18x.ctx_vars.dump_ctxsw_stats_on_channel_close -- cgit v1.2.2