diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2017-06-05 10:40:44 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-06 14:05:03 -0400 |
commit | 80197d2c9daa8e2320cc0b15741904eb3c1b9ba7 (patch) | |
tree | f6c5d33058f59df536860b4b1209950a63dda5be /drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |
parent | 26487b82df0c6604cc40fd6480f7ad7ed4e3efb0 (diff) |
gpu: nvgpu: split vidmem_is_vidmem
As the vidmem_is_vidmem flag has got two separate meanings in one bit,
split it in two bits into the enabled() API:
Add NVGPU_MM_HONORS_APERTURE bit, which is the same as vidmem_is_vidmem
with its original meaning, and use it to test which aperture bits to
write to hardware.
Add NVGPU_MM_UNIFIED_MEMORY bit, which has the opposite meaning: that
the GPU shares the SoC memory. When this flag is false, the GPU has its
own local video memory.
Jira NVGPU-86
Change-Id: I2d0bed3b1ede5a712be99323d3035b154bb23c3a
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1496080
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/platform_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 452b868d..9499f91a 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -215,8 +215,10 @@ struct gk20a_platform { | |||
215 | /* soc name for finding firmware files */ | 215 | /* soc name for finding firmware files */ |
216 | const char *soc_name; | 216 | const char *soc_name; |
217 | 217 | ||
218 | /* if vidmem aperture actually points to vidmem*/ | 218 | /* false if vidmem aperture actually points to sysmem */ |
219 | bool vidmem_is_vidmem; | 219 | bool honors_aperture; |
220 | /* unified or split memory with separate vidmem? */ | ||
221 | bool unified_memory; | ||
220 | 222 | ||
221 | /* minimum supported VBIOS version */ | 223 | /* minimum supported VBIOS version */ |
222 | u32 vbios_min_version; | 224 | u32 vbios_min_version; |