diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-12-08 07:07:39 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:12:27 -0400 |
commit | 5477d0f4c226847fe030ad00425e00206118b0d6 (patch) | |
tree | f9009dd92f5e4096a75ca126f177c52f77778fde /drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |
parent | 69bb5e156944d5df715d6bb388fd1c97fe458f18 (diff) |
gpu: nvgpu: Generic mem_desc & allocation
Make mem_desc a generic container for buffers. Add functions for
allocating and mapping buffers to an address space which store their
data in mem_desc.
Change-Id: I031643442c6fd41f5e7222fe9b7bfcaf9b784db5
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/660908
GVS: Gerrit_Virtual_Submit
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index f2b0c83c..867e775a 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -1618,11 +1618,9 @@ int gr_gk20a_load_golden_ctx_image(struct gk20a *g, | |||
1618 | virt_addr_hi); | 1618 | virt_addr_hi); |
1619 | 1619 | ||
1620 | /* no user for client managed performance counter ctx */ | 1620 | /* no user for client managed performance counter ctx */ |
1621 | ch_ctx->pm_ctx.ctx_sw_mode = | ||
1622 | ctxsw_prog_main_image_pm_mode_no_ctxsw_f(); | ||
1623 | data = gk20a_mem_rd32(ctx_ptr + ctxsw_prog_main_image_pm_o(), 0); | 1621 | data = gk20a_mem_rd32(ctx_ptr + ctxsw_prog_main_image_pm_o(), 0); |
1624 | data = data & ~ctxsw_prog_main_image_pm_mode_m(); | 1622 | data = data & ~ctxsw_prog_main_image_pm_mode_m(); |
1625 | data |= ch_ctx->pm_ctx.ctx_sw_mode; | 1623 | data |= ctxsw_prog_main_image_pm_mode_no_ctxsw_f(); |
1626 | gk20a_mem_wr32(ctx_ptr + ctxsw_prog_main_image_pm_o(), 0, | 1624 | gk20a_mem_wr32(ctx_ptr + ctxsw_prog_main_image_pm_o(), 0, |
1627 | data); | 1625 | data); |
1628 | 1626 | ||