From dc52b2451262c73c1479d90f91ebb539c26038c2 Mon Sep 17 00:00:00 2001 From: Antony Clince Alex Date: Fri, 8 Oct 2021 05:58:30 +0000 Subject: [PATCH] gpu: nvgpu: ga10b: update PMM litter values Fix PMM litter values for ROP and LTC units. The ROP unit has been moved from FBP to GPC, hence, introduce new litter constants: - GPU_LIT_PERFMON_PMMGPC_ROP_DOMAIN_START - GPU_LIT_PERFMON_PMMGPC_ROP_DOMAIN_COUNT Previous PMMFBP_ROP litter constants are removed. Update GPU_LIT_PERFMON_PMMFBP_LTC_DOMAIN_COUNT to 4. Jira NVGPU-7204 Change-Id: If3b5e278099ac0d503a3535f1b9b328dc105488b Signed-off-by: Antony Clince Alex Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2607544 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/gpu/nvgpu/hal/init/hal_ga10b_litter.c | 13 ++++++++----- drivers/gpu/nvgpu/include/nvgpu/gk20a.h | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/nvgpu/hal/init/hal_ga10b_litter.c b/drivers/gpu/nvgpu/hal/init/hal_ga10b_litter.c index c2303fcd5..314950e4f 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_ga10b_litter.c +++ b/drivers/gpu/nvgpu/hal/init/hal_ga10b_litter.c @@ -163,7 +163,10 @@ u32 ga10b_get_litter_value(struct gk20a *g, int value) case GPU_LIT_NUM_LTC_LTS_WAYS: ret = proj_scal_litter_num_ltc_lts_ways_v(); break; - /* TODO check these hardcoded values for ga10b: JIRA NVGPU-4709 */ + /* + * The perfmon start, count for various chiplets are taken + * from the PM programming guide. + */ case GPU_LIT_PERFMON_PMMGPCTPCA_DOMAIN_START: ret = 2; break; @@ -177,12 +180,12 @@ u32 ga10b_get_litter_value(struct gk20a *g, int value) ret = 1; break; case GPU_LIT_PERFMON_PMMFBP_LTC_DOMAIN_COUNT: - ret = 2; + ret = 4; break; - case GPU_LIT_PERFMON_PMMFBP_ROP_DOMAIN_START: - ret = 3; + case GPU_LIT_PERFMON_PMMGPC_ROP_DOMAIN_START: + ret = 14; break; - case GPU_LIT_PERFMON_PMMFBP_ROP_DOMAIN_COUNT: + case GPU_LIT_PERFMON_PMMGPC_ROP_DOMAIN_COUNT: ret = 2; break; case GPU_LIT_ROP_IN_GPC_BASE: diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h index d24871e2e..0d7207416 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h @@ -278,6 +278,8 @@ struct railgate_stats { #define GPU_LIT_ROP_IN_GPC_SHARED_BASE 53 #define GPU_LIT_ROP_IN_GPC_PRI_SHARED_IDX 54 #define GPU_LIT_ROP_IN_GPC_STRIDE 55 +#define GPU_LIT_PERFMON_PMMGPC_ROP_DOMAIN_START 56 +#define GPU_LIT_PERFMON_PMMGPC_ROP_DOMAIN_COUNT 57 /** @endcond */