diff options
author | Seshendra Gadagottu <sgadagottu@nvidia.com> | 2016-04-19 17:27:23 -0400 |
---|---|---|
committer | Ken Adams <kadams@nvidia.com> | 2016-04-23 08:19:03 -0400 |
commit | 26b0037dc691bd61f15d69dd67083b00c4fdaf1b (patch) | |
tree | caea42f6169660a7d73dbab5a52d3e40954e945d /drivers/gpu | |
parent | 63319c0fb9a44894ae02d2f4462103d3aa09bd66 (diff) |
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 <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/1129167
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ken Adams <kadams@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c | 6 |
2 files changed, 10 insertions, 0 deletions
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 { | |||
211 | 211 | ||
212 | /* soc name for finding firmware files */ | 212 | /* soc name for finding firmware files */ |
213 | const char *soc_name; | 213 | const char *soc_name; |
214 | |||
215 | /* if vidmem aperture actually points to vidmem*/ | ||
216 | bool vidmem_is_vidmem; | ||
217 | |||
214 | }; | 218 | }; |
215 | 219 | ||
216 | static inline struct gk20a_platform *gk20a_get_platform( | 220 | 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) | |||
774 | if (tegra_get_chipid() == TEGRA_CHIPID_TEGRA13) | 774 | if (tegra_get_chipid() == TEGRA_CHIPID_TEGRA13) |
775 | platform->soc_name = "tegra13x"; | 775 | platform->soc_name = "tegra13x"; |
776 | 776 | ||
777 | platform->g->mm.vidmem_is_vidmem = platform->vidmem_is_vidmem; | ||
778 | |||
777 | gk20a_tegra_get_clocks(dev); | 779 | gk20a_tegra_get_clocks(dev); |
778 | 780 | ||
779 | return 0; | 781 | return 0; |
@@ -910,6 +912,8 @@ struct gk20a_platform gk20a_tegra_platform = { | |||
910 | .dump_platform_dependencies = gk20a_tegra_debug_dump, | 912 | .dump_platform_dependencies = gk20a_tegra_debug_dump, |
911 | 913 | ||
912 | .soc_name = "tegra12x", | 914 | .soc_name = "tegra12x", |
915 | |||
916 | .vidmem_is_vidmem = false, | ||
913 | }; | 917 | }; |
914 | 918 | ||
915 | struct gk20a_platform gm20b_tegra_platform = { | 919 | struct gk20a_platform gm20b_tegra_platform = { |
@@ -970,4 +974,6 @@ struct gk20a_platform gm20b_tegra_platform = { | |||
970 | .has_cde = true, | 974 | .has_cde = true, |
971 | 975 | ||
972 | .soc_name = "tegra21x", | 976 | .soc_name = "tegra21x", |
977 | |||
978 | .vidmem_is_vidmem = false, | ||
973 | }; | 979 | }; |