nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Fix compbits mapping

Browse Source 
Commit e99aa2485f8992eabe3556f3ebcb57bdc8ad91ff broke compbits
mapping. So, let's fix it.

Bug 200077571

Change-Id: I02dc150fbcb4cd59660f510adde9f029290efdfb
Signed-off-by: Sami Kiminki <skiminki@nvidia.com>
Reviewed-on: http://git-master/r/745001
(cherry picked from commit 86fc7ec9a05999bea8de320840b962db3ee11410)
Reviewed-on: http://git-master/r/753281
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Sami Kiminki
2015-05-20 18:38:10 +03:00
committed by Terje Bergstrom
parent 34a3e35631
commit 5e85069f4f
1 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/gpu/nvgpu/gk20a/mm_gk20a.c
View File

@@ -271,7 +271,6 @@ static int gk20a_alloc_comptags(struct gk20a *g,
if (ctaglines_to_allocate < lines)
return -EINVAL; /* integer overflow */
pr_info("user-mapped CTAGS: %u\n", ctaglines_to_allocate);
}
/* store the allocator so we can use it when we free the ctags */
@@ -282,9 +281,19 @@ static int gk20a_alloc_comptags(struct gk20a *g,
priv->comptags.lines = lines;
priv->comptags.real_offset = offset;
priv->comptags.allocated_lines = ctaglines_to_allocate;
if (user_mappable) {
u64 win_size =
DIV_ROUND_UP(lines, g->gr.comptags_per_cacheline) *
aggregate_cacheline_sz;
win_size = roundup(win_size, small_pgsz);
if (user_mappable)
offset = DIV_ROUND_UP(offset, ctagline_align) * ctagline_align;
*ctag_map_win_ctagline = offset;
*ctag_map_win_size = win_size;
}
priv->comptags.offset = offset;
@@ -1458,14 +1467,32 @@ u64 gk20a_vm_map(struct vm_gk20a *vm,
gk20a_get_comptags(d, dmabuf, &comptags);
clear_ctags = true;
if (comptags.lines < comptags.allocated_lines) {
/* clear tail-padding comptags */
u32 ctagmin = comptags.offset + comptags.lines;
u32 ctagmax = comptags.offset +
comptags.allocated_lines - 1;
comptags.user_mappable = user_mappable;
g->ops.ltc.cbc_ctrl(g, gk20a_cbc_op_clear,
ctagmin, ctagmax);
if (user_mappable) {
/* comptags for the buffer will be
cleared later, but we need to make
sure the whole comptags allocation
(which may be bigger) is cleared in
order not to leak compbits */
const u32 buffer_ctag_end =
comptags.offset + comptags.lines;
const u32 alloc_ctag_end =
comptags.real_offset +
comptags.allocated_lines;
if (comptags.real_offset < comptags.offset)
g->ops.ltc.cbc_ctrl(
g, gk20a_cbc_op_clear,
comptags.real_offset,
comptags.offset - 1);
if (buffer_ctag_end < alloc_ctag_end)
g->ops.ltc.cbc_ctrl(
g, gk20a_cbc_op_clear,
buffer_ctag_end,
alloc_ctag_end - 1);
}
}
}