diff options
author | Dan Willemsen <dwillemsen@nvidia.com> | 2015-02-16 17:39:26 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 23:19:10 -0400 |
commit | b53b2973fedaa7340b2066f5c1dffbaa78c478d7 (patch) | |
tree | fbb6fcfa7fa014163d9ee87d98d56a229248cfb8 /drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |
parent | 6e3d5ac13f2a9740a7dbb21aeb06ba7af4f6bd12 (diff) |
gpu: nvgpu: Fix/HACK for v3.18
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index e9b39487..4d101845 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -580,7 +580,7 @@ int gr_gk20a_ctx_patch_write_begin(struct gk20a *g, | |||
580 | 580 | ||
581 | ch_ctx->patch_ctx.cpu_va = vmap(ch_ctx->patch_ctx.pages, | 581 | ch_ctx->patch_ctx.cpu_va = vmap(ch_ctx->patch_ctx.pages, |
582 | PAGE_ALIGN(ch_ctx->patch_ctx.size) >> PAGE_SHIFT, | 582 | PAGE_ALIGN(ch_ctx->patch_ctx.size) >> PAGE_SHIFT, |
583 | 0, pgprot_dmacoherent(PAGE_KERNEL)); | 583 | 0, pgprot_writecombine(PAGE_KERNEL)); |
584 | 584 | ||
585 | if (!ch_ctx->patch_ctx.cpu_va) | 585 | if (!ch_ctx->patch_ctx.cpu_va) |
586 | return -ENOMEM; | 586 | return -ENOMEM; |
@@ -691,7 +691,7 @@ static int gr_gk20a_ctx_zcull_setup(struct gk20a *g, struct channel_gk20a *c, | |||
691 | 691 | ||
692 | ctx_ptr = vmap(ch_ctx->gr_ctx->pages, | 692 | ctx_ptr = vmap(ch_ctx->gr_ctx->pages, |
693 | PAGE_ALIGN(ch_ctx->gr_ctx->size) >> PAGE_SHIFT, | 693 | PAGE_ALIGN(ch_ctx->gr_ctx->size) >> PAGE_SHIFT, |
694 | 0, pgprot_dmacoherent(PAGE_KERNEL)); | 694 | 0, pgprot_writecombine(PAGE_KERNEL)); |
695 | if (!ctx_ptr) | 695 | if (!ctx_ptr) |
696 | return -ENOMEM; | 696 | return -ENOMEM; |
697 | 697 | ||
@@ -1455,13 +1455,13 @@ static int gr_gk20a_init_golden_ctx_image(struct gk20a *g, | |||
1455 | 1455 | ||
1456 | gold_ptr = vmap(gr->global_ctx_buffer[GOLDEN_CTX].pages, | 1456 | gold_ptr = vmap(gr->global_ctx_buffer[GOLDEN_CTX].pages, |
1457 | PAGE_ALIGN(gr->global_ctx_buffer[GOLDEN_CTX].size) >> | 1457 | PAGE_ALIGN(gr->global_ctx_buffer[GOLDEN_CTX].size) >> |
1458 | PAGE_SHIFT, 0, pgprot_dmacoherent(PAGE_KERNEL)); | 1458 | PAGE_SHIFT, 0, pgprot_writecombine(PAGE_KERNEL)); |
1459 | if (!gold_ptr) | 1459 | if (!gold_ptr) |
1460 | goto clean_up; | 1460 | goto clean_up; |
1461 | 1461 | ||
1462 | ctx_ptr = vmap(ch_ctx->gr_ctx->pages, | 1462 | ctx_ptr = vmap(ch_ctx->gr_ctx->pages, |
1463 | PAGE_ALIGN(ch_ctx->gr_ctx->size) >> PAGE_SHIFT, | 1463 | PAGE_ALIGN(ch_ctx->gr_ctx->size) >> PAGE_SHIFT, |
1464 | 0, pgprot_dmacoherent(PAGE_KERNEL)); | 1464 | 0, pgprot_writecombine(PAGE_KERNEL)); |
1465 | if (!ctx_ptr) | 1465 | if (!ctx_ptr) |
1466 | goto clean_up; | 1466 | goto clean_up; |
1467 | 1467 | ||
@@ -1535,7 +1535,7 @@ int gr_gk20a_update_smpc_ctxsw_mode(struct gk20a *g, | |||
1535 | 1535 | ||
1536 | ctx_ptr = vmap(ch_ctx->gr_ctx->pages, | 1536 | ctx_ptr = vmap(ch_ctx->gr_ctx->pages, |
1537 | PAGE_ALIGN(ch_ctx->gr_ctx->size) >> PAGE_SHIFT, | 1537 | PAGE_ALIGN(ch_ctx->gr_ctx->size) >> PAGE_SHIFT, |
1538 | 0, pgprot_dmacoherent(PAGE_KERNEL)); | 1538 | 0, pgprot_writecombine(PAGE_KERNEL)); |
1539 | if (!ctx_ptr) | 1539 | if (!ctx_ptr) |
1540 | return -ENOMEM; | 1540 | return -ENOMEM; |
1541 | 1541 | ||
@@ -1575,7 +1575,7 @@ int gr_gk20a_load_golden_ctx_image(struct gk20a *g, | |||
1575 | 1575 | ||
1576 | ctx_ptr = vmap(ch_ctx->gr_ctx->pages, | 1576 | ctx_ptr = vmap(ch_ctx->gr_ctx->pages, |
1577 | PAGE_ALIGN(ch_ctx->gr_ctx->size) >> PAGE_SHIFT, | 1577 | PAGE_ALIGN(ch_ctx->gr_ctx->size) >> PAGE_SHIFT, |
1578 | 0, pgprot_dmacoherent(PAGE_KERNEL)); | 1578 | 0, pgprot_writecombine(PAGE_KERNEL)); |
1579 | if (!ctx_ptr) | 1579 | if (!ctx_ptr) |
1580 | return -ENOMEM; | 1580 | return -ENOMEM; |
1581 | 1581 | ||
@@ -4554,7 +4554,7 @@ static int gr_gk20a_init_access_map(struct gk20a *g) | |||
4554 | 4554 | ||
4555 | data = vmap(gr->global_ctx_buffer[PRIV_ACCESS_MAP].pages, | 4555 | data = vmap(gr->global_ctx_buffer[PRIV_ACCESS_MAP].pages, |
4556 | PAGE_ALIGN(gr->global_ctx_buffer[PRIV_ACCESS_MAP].size) >> | 4556 | PAGE_ALIGN(gr->global_ctx_buffer[PRIV_ACCESS_MAP].size) >> |
4557 | PAGE_SHIFT, 0, pgprot_dmacoherent(PAGE_KERNEL)); | 4557 | PAGE_SHIFT, 0, pgprot_writecombine(PAGE_KERNEL)); |
4558 | if (!data) { | 4558 | if (!data) { |
4559 | gk20a_err(dev_from_gk20a(g), | 4559 | gk20a_err(dev_from_gk20a(g), |
4560 | "failed to map priv access map memory"); | 4560 | "failed to map priv access map memory"); |
@@ -6970,7 +6970,7 @@ int gr_gk20a_exec_ctx_ops(struct channel_gk20a *ch, | |||
6970 | /* recoded in-place instead.*/ | 6970 | /* recoded in-place instead.*/ |
6971 | ctx_ptr = vmap(ch_ctx->gr_ctx->pages, | 6971 | ctx_ptr = vmap(ch_ctx->gr_ctx->pages, |
6972 | PAGE_ALIGN(ch_ctx->gr_ctx->size) >> PAGE_SHIFT, | 6972 | PAGE_ALIGN(ch_ctx->gr_ctx->size) >> PAGE_SHIFT, |
6973 | 0, pgprot_dmacoherent(PAGE_KERNEL)); | 6973 | 0, pgprot_writecombine(PAGE_KERNEL)); |
6974 | if (!ctx_ptr) { | 6974 | if (!ctx_ptr) { |
6975 | err = -ENOMEM; | 6975 | err = -ENOMEM; |
6976 | goto cleanup; | 6976 | goto cleanup; |