From 907fcae63816b68e43e07e3d7abaad87954b8326 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Wed, 5 Jul 2017 19:05:06 -0700 Subject: gpu: nvgpu: Reorg bus HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the bus sub-module of the gpu_ops struct. Perform HAL function assignments in hal_gxxxx.c through the population of a chip-specific copy of gpu_ops. Jira NVGPU-74 Change-Id: If03303c34d91480d41fc29e66069efd43e970d75 Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1514660 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gm20b/bus_gm20b.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b/bus_gm20b.c') diff --git a/drivers/gpu/nvgpu/gm20b/bus_gm20b.c b/drivers/gpu/nvgpu/gm20b/bus_gm20b.c index 11c11e23..0da19db8 100644 --- a/drivers/gpu/nvgpu/gm20b/bus_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/bus_gm20b.c @@ -22,7 +22,7 @@ #include -static int gm20b_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst) +int gm20b_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst) { struct nvgpu_timeout timeout; int err = 0; @@ -53,12 +53,3 @@ static int gm20b_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst) return err; } - -void gm20b_init_bus(struct gpu_ops *gops) -{ - gops->bus.init_hw = gk20a_bus_init_hw; - gops->bus.isr = gk20a_bus_isr; - gops->bus.read_ptimer = gk20a_read_ptimer; - gops->bus.get_timestamps_zipper = nvgpu_get_timestamps_zipper; - gops->bus.bar1_bind = gm20b_bus_bar1_bind; -} -- cgit v1.2.2