diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-09-24 11:28:28 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-09-24 11:28:38 -0400 |
commit | 41f9e9747720f0658b84491fcf77010d71e1900d (patch) | |
tree | 8e46260b1d1b1e5983713e45ffcd8804c7cb27c6 /drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |
parent | 6ceef08d52daabdf4911f28086e082b1dd2559f1 (diff) |
Revert "gpu: nvgpu: Add CDE bits in FECS header"
This reverts commit 882975f7f1b4e050be79b0a047a2daa8b53a9187.
Change-Id: I4940fc9f7a837840be1ea8e42d58d603235d88d5
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/804616
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 24ee8876..0ae44c6f 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -1612,7 +1612,7 @@ int gr_gk20a_load_golden_ctx_image(struct gk20a *g, | |||
1612 | struct channel_ctx_gk20a *ch_ctx = &c->ch_ctx; | 1612 | struct channel_ctx_gk20a *ch_ctx = &c->ch_ctx; |
1613 | u32 virt_addr_lo; | 1613 | u32 virt_addr_lo; |
1614 | u32 virt_addr_hi; | 1614 | u32 virt_addr_hi; |
1615 | u32 i, v, data, cde_v; | 1615 | u32 i, v, data; |
1616 | int ret = 0; | 1616 | int ret = 0; |
1617 | void *ctx_ptr = NULL; | 1617 | void *ctx_ptr = NULL; |
1618 | 1618 | ||
@@ -1631,15 +1631,6 @@ int gr_gk20a_load_golden_ctx_image(struct gk20a *g, | |||
1631 | if (!ctx_ptr) | 1631 | if (!ctx_ptr) |
1632 | return -ENOMEM; | 1632 | return -ENOMEM; |
1633 | 1633 | ||
1634 | /* Enable CDE in FECS header. Default cde = 0, is disabled, | ||
1635 | * so no need to do anything in else {} | ||
1636 | */ | ||
1637 | if (c->cde) { | ||
1638 | cde_v = gk20a_mem_rd32(ctx_ptr + ctxsw_prog_main_image_ctl_o(), 0); | ||
1639 | cde_v |= ctxsw_prog_main_image_ctl_cde_enabled_f(); | ||
1640 | gk20a_mem_wr32(ctx_ptr + ctxsw_prog_main_image_ctl_o(), 0, cde_v); | ||
1641 | } | ||
1642 | |||
1643 | for (i = 0; i < gr->ctx_vars.golden_image_size / 4; i++) | 1634 | for (i = 0; i < gr->ctx_vars.golden_image_size / 4; i++) |
1644 | gk20a_mem_wr32(ctx_ptr, i, gr->ctx_vars.local_golden_image[i]); | 1635 | gk20a_mem_wr32(ctx_ptr, i, gr->ctx_vars.local_golden_image[i]); |
1645 | 1636 | ||