From f8399cfa553b6fb6d82c7fa762c372f03bf59d5f Mon Sep 17 00:00:00 2001 From: Sunny He Date: Fri, 11 Aug 2017 14:41:33 -0700 Subject: Revert "gpu: nvgpu: Reorg mm HAL initialization" Conflicts with gv100 changes This reverts commit 8d63cd3995d4a650b478ad69d7e29ed2b1b2d927. Change-Id: Ie2f88d281b2b87a9a794d79164a61c4d883626b7 Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1537668 Reviewed-by: Shu Zhong Tested-by: Shu Zhong --- drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c') diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c index 71081be5..36ca850e 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c @@ -662,7 +662,7 @@ void gk20a_tegra_idle(struct device *dev) void gk20a_tegra_init_secure_alloc(struct gk20a *g) { - g->ops.secure_alloc = gk20a_tegra_secure_alloc; + g->ops.mm.secure_alloc = gk20a_tegra_secure_alloc; } #ifdef CONFIG_COMMON_CLK -- cgit v1.2.2