From 91af7efd23efbfdc8d2b60e18ccf67bd290f7bb0 Mon Sep 17 00:00:00 2001 From: mkumbar Date: Fri, 15 May 2020 13:37:01 +0530 Subject: [PATCH] gpu: nvgpu: enable ACR support for NEXT dGPU -Enabled ACR support for NEXT dGPU -Blob creation & boot strap of LSPMU support skipped by ACR by checking flag "support_ls_pmu", lspmu support is not required until PSTATE support is enabled. JIRA NVGPU-5461 Change-Id: I5a4c688926ca1c55aeb4cbbb9668c55bb35f9119 Signed-off-by: mkumbar Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2344582 Reviewed-by: automaticguardword Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-mobile-cert Reviewed-by: Abdul Salam Reviewed-by: Vaibhav Kachore Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/acr/acr.c | 7 +++++++ drivers/gpu/nvgpu/common/acr/acr_sw_tu104.c | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/common/acr/acr.c b/drivers/gpu/nvgpu/common/acr/acr.c index cc834b886..fb69c2759 100644 --- a/drivers/gpu/nvgpu/common/acr/acr.c +++ b/drivers/gpu/nvgpu/common/acr/acr.c @@ -36,6 +36,10 @@ #include "acr_sw_tu104.h" #endif +#if defined(CONFIG_NVGPU_NEXT) && defined(CONFIG_NVGPU_NON_FUSA) +#include "nvgpu_next_gpuid.h" +#endif + /* ACR public API's */ bool nvgpu_acr_is_lsf_lazy_bootstrap(struct gk20a *g, struct nvgpu_acr *acr, u32 falcon_id) @@ -171,6 +175,9 @@ int nvgpu_acr_init(struct gk20a *g) break; #ifdef CONFIG_NVGPU_DGPU case NVGPU_GPUID_TU104: +#if defined(CONFIG_NVGPU_NEXT) + case NVGPU_NEXT_DGPU_GPUID: +#endif nvgpu_tu104_acr_sw_init(g, g->acr); break; #endif diff --git a/drivers/gpu/nvgpu/common/acr/acr_sw_tu104.c b/drivers/gpu/nvgpu/common/acr/acr_sw_tu104.c index 3347b4372..ffd8b4773 100644 --- a/drivers/gpu/nvgpu/common/acr/acr_sw_tu104.c +++ b/drivers/gpu/nvgpu/common/acr/acr_sw_tu104.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2020, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -123,6 +123,12 @@ static u32 tu104_acr_lsf_sec2(struct gk20a *g, static u32 tu104_acr_lsf_pmu(struct gk20a *g, struct acr_lsf_config *lsf) { + /* PMU support not required until PSTATE support is enabled */ + if (!g->support_ls_pmu) { + /* skip adding LS PMU ucode to ACR blob */ + return 0; + } + /* PMU LS falcon info */ lsf->falcon_id = FALCON_ID_PMU; lsf->falcon_dma_idx = GK20A_PMU_DMAIDX_UCODE;