From d64e2015147c4dc48c0d3b8d6ee612dd8addf04c Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Fri, 8 Jul 2016 16:12:44 -0700 Subject: gpu: nvgpu: add check for is_fmodel is_fmodel flag will be set in gk20a_probe(). Updated code for is_fmodel check, instead of check for supported simulated platforms. Bug 1735760 Change-Id: I7cbac2196130fe5ce4c1a910504879e6948c13da Signed-off-by: Seema Khowala Reviewed-on: http://git-master/r/1177869 Reviewed-by: Seshendra Gadagottu Tested-by: Seshendra Gadagottu Reviewed-by: Adeel Raza Reviewed-by: Automatic_Commit_Validation_User --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 6de7425b..16ff8ee8 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -1023,10 +1023,11 @@ static int alloc_gmmu_pages(struct vm_gk20a *vm, u32 order, u32 num_pages = 1 << order; u32 len = num_pages * PAGE_SIZE; int err; + struct gk20a_platform *platform = dev_get_drvdata(g->dev); gk20a_dbg_fn(""); - if (tegra_platform_is_linsim()) + if (platform->is_fmodel) return alloc_gmmu_phys_pages(vm, order, entry); /* @@ -1052,13 +1053,14 @@ void free_gmmu_pages(struct vm_gk20a *vm, struct gk20a_mm_entry *entry) { struct gk20a *g = gk20a_from_vm(vm); + struct gk20a_platform *platform = dev_get_drvdata(g->dev); gk20a_dbg_fn(""); if (!entry->mem.size) return; - if (tegra_platform_is_linsim()) { + if (platform->is_fmodel) { free_gmmu_phys_pages(vm, entry); return; } @@ -1076,9 +1078,11 @@ void free_gmmu_pages(struct vm_gk20a *vm, int map_gmmu_pages(struct gk20a *g, struct gk20a_mm_entry *entry) { + struct gk20a_platform *platform = dev_get_drvdata(g->dev); + gk20a_dbg_fn(""); - if (tegra_platform_is_linsim()) + if (platform->is_fmodel) return map_gmmu_phys_pages(entry); if (IS_ENABLED(CONFIG_ARM64)) { @@ -1100,9 +1104,11 @@ int map_gmmu_pages(struct gk20a *g, struct gk20a_mm_entry *entry) void unmap_gmmu_pages(struct gk20a *g, struct gk20a_mm_entry *entry) { + struct gk20a_platform *platform = dev_get_drvdata(g->dev); + gk20a_dbg_fn(""); - if (tegra_platform_is_linsim()) { + if (platform->is_fmodel) { unmap_gmmu_phys_pages(entry); return; } -- cgit v1.2.2