From c43e3e4aebd3527f00a24835195ed01c99fd7f4e Mon Sep 17 00:00:00 2001 From: mkumbar Date: Tue, 2 Jun 2020 21:26:38 +0530 Subject: [PATCH] gpu: nvgpu: acr: add fecs/gpccs sig files read for next dgpu add fecs/gpccs sig file read for next dgpu. JIRA NVGPU-5461 Change-Id: Ib135dab8961c53d62fb7a95e378eba4c81d729a2 Signed-off-by: mkumbar Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2354622 Tested-by: mobile promotions Reviewed-by: automaticguardword Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions --- .../gpu/nvgpu/common/acr/acr_blob_construct.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/gpu/nvgpu/common/acr/acr_blob_construct.c b/drivers/gpu/nvgpu/common/acr/acr_blob_construct.c index b97e09520..b9a3ad951 100644 --- a/drivers/gpu/nvgpu/common/acr/acr_blob_construct.c +++ b/drivers/gpu/nvgpu/common/acr/acr_blob_construct.c @@ -33,6 +33,11 @@ #include "acr_wpr.h" #include "acr_priv.h" +#if defined(CONFIG_NVGPU_NEXT) && defined(CONFIG_NVGPU_NON_FUSA) +#include "nvgpu_next_gpuid.h" +#endif + + #define APP_IMEM_OFFSET (0) #define APP_IMEM_ENTRY (0) #define APP_DMEM_OFFSET (0) @@ -108,6 +113,13 @@ int nvgpu_acr_lsf_fecs_ucode_details(struct gk20a *g, void *lsf_ucode_img) NVGPU_REQUEST_FIRMWARE_NO_SOC); break; #endif +#if defined(CONFIG_NVGPU_NEXT) + case NVGPU_NEXT_DGPU_GPUID: + fecs_sig = nvgpu_request_firmware(g, NEXT_DGPU_FECS_UCODE_SIG, + NVGPU_REQUEST_FIRMWARE_NO_SOC); + break; +#endif + default: nvgpu_err(g, "no support for GPUID %x", ver); break; @@ -208,6 +220,13 @@ int nvgpu_acr_lsf_gpccs_ucode_details(struct gk20a *g, void *lsf_ucode_img) NVGPU_REQUEST_FIRMWARE_NO_SOC); break; #endif +#if defined(CONFIG_NVGPU_NEXT) + case NVGPU_NEXT_DGPU_GPUID: + gpccs_sig = nvgpu_request_firmware(g, NEXT_DGPU_GPCCS_UCODE_SIG, + NVGPU_REQUEST_FIRMWARE_NO_SOC); + break; +#endif + default: nvgpu_err(g, "no support for GPUID %x", ver); break;