summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-01-03 16:02:56 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2018-01-04 14:04:43 -0500
commitdde1913f164a030256bb454a8e9917279ae21396 (patch)
treedc5d6924ef98855f002f96a12eff292f53df4362 /drivers
parent031eb0ec834c31e0f03b563877b996788f9d9f9f (diff)
gpu: nvgpu: Do not disable ELPG when committing buffers
Committing buffer addresses only writes to the memory. There's no need to disable ELPG for the duration, so drop the ELPG protection. Change-Id: I8d8d08506387197e4737e0311df4a20085496056 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1631149 Reviewed-by: Deepak Nibade <dnibade@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/common/linux/vgpu/gr_vgpu.c3
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/gr_vgpu.c
index 4d36e66b..fa2010cd 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/gr_vgpu.c
@@ -581,8 +581,7 @@ int vgpu_gr_alloc_obj_ctx(struct channel_gk20a *c, u32 class_num, u32 flags)
581 nvgpu_err(g, "fail to map global ctx buffer"); 581 nvgpu_err(g, "fail to map global ctx buffer");
582 goto out; 582 goto out;
583 } 583 }
584 gr_gk20a_elpg_protected_call(g, 584 vgpu_gr_commit_global_ctx_buffers(g, c, true);
585 vgpu_gr_commit_global_ctx_buffers(g, c, true));
586 } 585 }
587 586
588 /* load golden image */ 587 /* load golden image */
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index c7104941..11054087 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -2975,8 +2975,7 @@ int gk20a_alloc_obj_ctx(struct channel_gk20a *c, u32 class_num, u32 flags)
2975 "fail to map global ctx buffer"); 2975 "fail to map global ctx buffer");
2976 goto out; 2976 goto out;
2977 } 2977 }
2978 gr_gk20a_elpg_protected_call(g, 2978 gr_gk20a_commit_global_ctx_buffers(g, c, true);
2979 gr_gk20a_commit_global_ctx_buffers(g, c, true));
2980 } 2979 }
2981 2980
2982 /* init golden image, ELPG enabled after this is done */ 2981 /* init golden image, ELPG enabled after this is done */