From 4b8dc71de5696679f13f8863bc5775a23e786b34 Mon Sep 17 00:00:00 2001 From: Peter Daifuku Date: Fri, 6 Oct 2017 15:38:11 -0700 Subject: gpu: nvgpu: vgpu: flatten out t19x vgpu hal Instead of calling the native HAL init function then adding multiple layers of modification for VGPU, flatten out the sequence so that all entry points are set statically and visible in a single file. JIRA ESRM-30 Change-Id: I8d277aaccb0e63b2d504e7aba32eb31ef82f4ec0 Signed-off-by: Peter Daifuku Reviewed-on: https://git-master.nvidia.com/r/1574619 Reviewed-by: svc-mobile-coverity Reviewed-by: Richard Zhao GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c') diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c index ff13b11f..048a4c64 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c @@ -21,14 +21,10 @@ */ #include -#include #include "vgpu/vgpu.h" -#include "vgpu_fifo_gv11b.h" -#include "vgpu_subctx_gv11b.h" - -static int vgpu_gv11b_init_fifo_setup_hw(struct gk20a *g) +int vgpu_gv11b_init_fifo_setup_hw(struct gk20a *g) { struct fifo_gk20a *f = &g->fifo; int err; @@ -43,13 +39,3 @@ static int vgpu_gv11b_init_fifo_setup_hw(struct gk20a *g) return 0; } - -void vgpu_gv11b_init_fifo_ops(struct gpu_ops *gops) -{ - vgpu_gp10b_init_fifo_ops(gops); - - gops->fifo.init_fifo_setup_hw = vgpu_gv11b_init_fifo_setup_hw; - gops->fifo.free_channel_ctx_header = vgpu_gv11b_free_subctx_header; - /* TODO: implement it for CE fault */ - gops->fifo.tsg_verify_status_faulted = NULL; -} -- cgit v1.2.2