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/gp10b | |
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/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 386318e7..cfc2eb8d 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -68,8 +68,8 @@ int channel_gp10b_commit_userd(struct channel_gk20a *c) | |||
68 | 68 | ||
69 | nvgpu_mem_wr32(g, &c->inst_block, | 69 | nvgpu_mem_wr32(g, &c->inst_block, |
70 | ram_in_ramfc_w() + ram_fc_userd_w(), | 70 | ram_in_ramfc_w() + ram_fc_userd_w(), |
71 | (g->mm.vidmem_is_vidmem ? | 71 | nvgpu_aperture_mask(g, &g->fifo.userd, |
72 | pbdma_userd_target_sys_mem_ncoh_f() : | 72 | pbdma_userd_target_sys_mem_ncoh_f(), |
73 | pbdma_userd_target_vid_mem_f()) | | 73 | pbdma_userd_target_vid_mem_f()) | |
74 | pbdma_userd_addr_f(addr_lo)); | 74 | pbdma_userd_addr_f(addr_lo)); |
75 | 75 | ||