From 6299b00beb9dabdd53c211b02658d022827b3232 Mon Sep 17 00:00:00 2001 From: Lakshmanan M Date: Thu, 2 Jun 2016 09:34:46 +0530 Subject: gpu: nvgpu: Add multiple engine and runlist support This CL covers the following modification, 1) Added multiple engine_info support 2) Added multiple runlist_info support 3) Initial changes for ASYNC CE support 4) Added ASYNC CE interrupt handling support for gm206 GPU family 5) Added generic mechanism to identify the CE engine pri_base address for gm206 (CE0, CE1 and CE2) 6) Removed hard coded engine_id logic and made generic way 7) Code cleanup for readability JIRA DNVGPU-26 Change-Id: I2c3846c40bcc8d10c2dfb225caa4105fc9123b65 Signed-off-by: Lakshmanan M Reviewed-on: http://git-master/r/1155963 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gm206/hal_gm206.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gm206/hal_gm206.c') diff --git a/drivers/gpu/nvgpu/gm206/hal_gm206.c b/drivers/gpu/nvgpu/gm206/hal_gm206.c index 048a109f..6b5c70e2 100644 --- a/drivers/gpu/nvgpu/gm206/hal_gm206.c +++ b/drivers/gpu/nvgpu/gm206/hal_gm206.c @@ -21,7 +21,7 @@ #include "gm20b/mc_gm20b.h" #include "gm20b/ltc_gm20b.h" #include "gm20b/mm_gm20b.h" -#include "gm20b/ce2_gm20b.h" +#include "ce_gm206.h" #include "gm20b/fb_gm20b.h" #include "gm20b/pmu_gm20b.h" #include "gm20b/gr_gm20b.h" @@ -142,6 +142,9 @@ static int gm206_get_litter_value(struct gk20a *g, case GPU_LIT_ROP_SHARED_BASE: ret = proj_rop_shared_base_v(); break; + case GPU_LIT_HOST_NUM_ENGINES: + ret = proj_host_num_engines_v(); + break; case GPU_LIT_HOST_NUM_PBDMA: ret = proj_host_num_pbdma_v(); break; @@ -183,7 +186,7 @@ int gm206_init_hal(struct gk20a *g) gm20b_init_fb(gops); g->ops.fb.set_use_full_comp_tag_line = NULL; gm206_init_fifo(gops); - gm20b_init_ce2(gops); + gm206_init_ce(gops); gm20b_init_gr_ctx(gops); gm20b_init_mm(gops); gm206_init_pmu_ops(gops); -- cgit v1.2.2