From 7a033af6602258b2f2c738a7836d17562b17d8b8 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Fri, 28 Sep 2018 14:06:15 +0530 Subject: gpu: nvgpu: remove VPR HALs from dGPUs gops.fb.dump_vpr_wpr_info() accesses both VPR and WPR registers. Split this into two different HALs gops.fb.dump_vpr_info() and gops.fb.dump_wpr_info() Also unset HALs accessing VPR registers on dGPUs We don't support VPR on dGPUs Remove fb_mmu_vpr_info_r() register and all its accessors from dGPU headers Bug 2173122 Change-Id: I5b2712f8c5389e422a84c375a7e836add48bfd1c Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/1850947 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index b642075e..644531f1 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -468,8 +468,11 @@ int gk20a_mm_fb_flush(struct gk20a *g) } while (!nvgpu_timeout_expired(&timeout)); if (nvgpu_timeout_peek_expired(&timeout)) { - if (g->ops.fb.dump_vpr_wpr_info) { - g->ops.fb.dump_vpr_wpr_info(g); + if (g->ops.fb.dump_vpr_info) { + g->ops.fb.dump_vpr_info(g); + } + if (g->ops.fb.dump_wpr_info) { + g->ops.fb.dump_wpr_info(g); } ret = -EBUSY; } -- cgit v1.2.2