From 26b0037dc691bd61f15d69dd67083b00c4fdaf1b Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Tue, 19 Apr 2016 14:27:23 -0700 Subject: gpu: nvgpu: set soc memory aperture type Set platform data for soc memory aperture type, whether soc memory aperture seen as sysmem or vidmem. For gk20a/gm20b, soc memory aperture seen as vidmem. Bug 1749338 Change-Id: I407562ca484c1a4bae1bee12089d2b19f378ca53 Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/1129167 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Ken Adams --- drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 4 ++++ drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index b2f3b870..38ce5a97 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h @@ -211,6 +211,10 @@ struct gk20a_platform { /* soc name for finding firmware files */ const char *soc_name; + + /* if vidmem aperture actually points to vidmem*/ + bool vidmem_is_vidmem; + }; static inline struct gk20a_platform *gk20a_get_platform( diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c index 784128b1..abe6771c 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c @@ -774,6 +774,8 @@ static int gk20a_tegra_probe(struct device *dev) if (tegra_get_chipid() == TEGRA_CHIPID_TEGRA13) platform->soc_name = "tegra13x"; + platform->g->mm.vidmem_is_vidmem = platform->vidmem_is_vidmem; + gk20a_tegra_get_clocks(dev); return 0; @@ -910,6 +912,8 @@ struct gk20a_platform gk20a_tegra_platform = { .dump_platform_dependencies = gk20a_tegra_debug_dump, .soc_name = "tegra12x", + + .vidmem_is_vidmem = false, }; struct gk20a_platform gm20b_tegra_platform = { @@ -970,4 +974,6 @@ struct gk20a_platform gm20b_tegra_platform = { .has_cde = true, .soc_name = "tegra21x", + + .vidmem_is_vidmem = false, }; -- cgit v1.2.2