nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-25 11:04:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: FW load flag update

Browse Source 
-Move FW load flag settings before chips specific SW init in
 ACR unit init. This helps to alter the flag later based on
 the chip requirment if required.

Bug 3765772

Change-Id: I4639d85c0d4ffce06a172acef42891011125b322
Signed-off-by: mkumbar <mkumbar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2773059
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Rajesh Devaraj <rdevaraj@nvidia.com>
Reviewed-by: Mayur Poojary <mpoojary@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
mkumbar
2022-09-07 20:07:08 +05:30
committed by mobile promotions
parent f43897c940
commit 71065d8613
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/gpu/nvgpu/common/acr/acr.c
View File

@@ -134,6 +134,20 @@ int nvgpu_acr_init(struct gk20a *g)
goto done;
}
/*
* Firmware is stored in soc specific path in FMODEL
* Hence NVGPU_REQUEST_FIRMWARE_NO_WARN is used instead
* of NVGPU_REQUEST_FIRMWARE_NO_SOC
*/
#ifdef CONFIG_NVGPU_SIM
if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
g->acr->fw_load_flag = NVGPU_REQUEST_FIRMWARE_NO_WARN;
} else
#endif
{
g->acr->fw_load_flag = NVGPU_REQUEST_FIRMWARE_NO_SOC;
}
switch (ver) {
#ifdef CONFIG_NVGPU_ACR_LEGACY
case GK20A_GPUID_GM20B:
@@ -172,21 +186,6 @@ int nvgpu_acr_init(struct gk20a *g)
break;
}
/*
* Firmware is stored in soc specific path in FMODEL
* Hence NVGPU_REQUEST_FIRMWARE_NO_WARN is used instead
* of NVGPU_REQUEST_FIRMWARE_NO_SOC
*/
if (err == 0) {
#ifdef CONFIG_NVGPU_SIM
if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
g->acr->fw_load_flag = NVGPU_REQUEST_FIRMWARE_NO_WARN;
} else
#endif
{
g->acr->fw_load_flag = NVGPU_REQUEST_FIRMWARE_NO_SOC;
}
}
done:
return err;
}