From 2b582c5141752ff272c5d059b56433155bc3985a Mon Sep 17 00:00:00 2001 From: Sunny He Date: Wed, 28 Jun 2017 17:41:55 -0700 Subject: gpu: nvgpu: Reorg priv_ring HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the priv_ring 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: I9ebf27619f771262e5dc398b1200d6c19d6aef16 Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1514102 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c | 5 ----- drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h | 1 - drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 7 +++++-- drivers/gpu/nvgpu/gp106/hal_gp106.c | 6 +++++- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 6 +++++- drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c | 7 +------ drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.h | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c index dbab6b4b..ef642416 100644 --- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c @@ -95,8 +95,3 @@ void gk20a_priv_ring_isr(struct gk20a *g) if (retry <= 0) nvgpu_warn(g, "priv ringmaster cmd ack too many retries"); } - -void gk20a_init_priv_ring(struct gpu_ops *gops) -{ - gops->priv_ring.isr = gk20a_priv_ring_isr; -} diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h index 61780288..e6c458a5 100644 --- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h @@ -19,6 +19,5 @@ struct gpu_ops; void gk20a_priv_ring_isr(struct gk20a *g); void gk20a_enable_priv_ring(struct gk20a *g); -void gk20a_init_priv_ring(struct gpu_ops *gops); #endif /*__PRIV_RING_GK20A_H__*/ diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index fa7cf368..87acb25c 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -256,6 +256,9 @@ static const struct gpu_ops gm20b_ops = { .falcon = { .falcon_hal_sw_init = gk20a_falcon_hal_sw_init, }, + .priv_ring = { + .isr = gk20a_priv_ring_isr, + }, .chip_init_gpu_characteristics = gk20a_init_gpu_characteristics, .get_litter_value = gm20b_get_litter_value, }; @@ -278,6 +281,8 @@ int gm20b_init_hal(struct gk20a *g) #endif gops->falcon = gm20b_ops.falcon; + gops->priv_ring = gm20b_ops.priv_ring; + /* Lone functions */ gops->chip_init_gpu_characteristics = gm20b_ops.chip_init_gpu_characteristics; @@ -312,9 +317,7 @@ int gm20b_init_hal(struct gk20a *g) } } #endif - g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; - gk20a_init_priv_ring(gops); gm20b_init_gr(gops); gm20b_init_fb(gops); gm20b_init_fifo(gops); diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index dde0468a..1690c42b 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -314,6 +314,9 @@ static const struct gpu_ops gp106_ops = { .falcon = { .falcon_hal_sw_init = gp106_falcon_hal_sw_init, }, + .priv_ring = { + .isr = gp10b_priv_ring_isr, + }, .get_litter_value = gp106_get_litter_value, .chip_init_gpu_characteristics = gp106_init_gpu_characteristics, .bios_init = gm206_bios_init, @@ -338,6 +341,7 @@ int gp106_init_hal(struct gk20a *g) #endif gops->xve = gp106_ops.xve; gops->falcon = gp106_ops.falcon; + gops->priv_ring = gp106_ops.priv_ring; /* Lone functions */ gops->get_litter_value = gp106_ops.get_litter_value; @@ -349,8 +353,8 @@ int gp106_init_hal(struct gk20a *g) gops->securegpccs = 1; gops->pmupstate = true; + g->bootstrap_owner = LSF_FALCON_ID_SEC2; - gp10b_init_priv_ring(gops); gp106_init_gr(gops); gp10b_init_fecs_trace_ops(gops); gp106_init_fb(gops); diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index fab1c238..4479be42 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -266,6 +266,9 @@ static const struct gpu_ops gp10b_ops = { .falcon = { .falcon_hal_sw_init = gk20a_falcon_hal_sw_init, }, + .priv_ring = { + .isr = gp10b_priv_ring_isr, + }, .chip_init_gpu_characteristics = gp10b_init_gpu_characteristics, .get_litter_value = gp10b_get_litter_value, }; @@ -288,6 +291,8 @@ int gp10b_init_hal(struct gk20a *g) #endif gops->falcon = gp10b_ops.falcon; + gops->priv_ring = gp10b_ops.priv_ring; + /* Lone Functions */ gops->chip_init_gpu_characteristics = gp10b_ops.chip_init_gpu_characteristics; @@ -332,7 +337,6 @@ int gp10b_init_hal(struct gk20a *g) #endif g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; - gp10b_init_priv_ring(gops); gp10b_init_gr(gops); gp10b_init_fecs_trace_ops(gops); gp10b_init_fb(gops); diff --git a/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c b/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c index 8aaa7bff..0ca29809 100644 --- a/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c @@ -27,7 +27,7 @@ #include #include -static void gp10b_priv_ring_isr(struct gk20a *g) +void gp10b_priv_ring_isr(struct gk20a *g) { u32 status0, status1; u32 cmd; @@ -76,8 +76,3 @@ static void gp10b_priv_ring_isr(struct gk20a *g) if (retry <= 0) nvgpu_warn(g, "priv ringmaster cmd ack too many retries"); } - -void gp10b_init_priv_ring(struct gpu_ops *gops) -{ - gops->priv_ring.isr = gp10b_priv_ring_isr; -} diff --git a/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.h b/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.h index acd0857f..e12a2f27 100644 --- a/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.h @@ -15,8 +15,8 @@ #ifndef __PRIV_RING_GP10B_H__ #define __PRIV_RING_GP10B_H__ -struct gpu_ops; +struct gk20a; -void gp10b_init_priv_ring(struct gpu_ops *gops); +void gp10b_priv_ring_isr(struct gk20a *g); #endif /*__PRIV_RING_GP10B_H__*/ -- cgit v1.2.2