From 80fa45e46eb2ff80fb463ef3b6b36bbb6fc75e7e Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Wed, 23 Jan 2019 15:46:36 +0200 Subject: [PATCH] Revert "gpu: nvgpu: Enable FBQ support of PMU tu10a & gv10x profile" This reverts commit bd192e8eaa99ad20463dddeefaebdeb71101f3eb. Bug 2487534 Signed-off-by: Konsta Holtta Change-Id: I5b43d0b5f04ed1a8c69637631829af1e29f82115 Reviewed-on: https://git-master.nvidia.com/r/2001918 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-misra-checker --- drivers/gpu/nvgpu/common/pmu/pmu_fw.c | 4 ++-- drivers/gpu/nvgpu/gv100/hal_gv100.c | 1 - drivers/gpu/nvgpu/tu104/hal_tu104.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c index 7a00058f1..d60d2d787 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c @@ -38,9 +38,9 @@ #define NVGPU_PMU_NS_UCODE_IMAGE "gpmu_ucode.bin" /* PMU F/W version */ -#define APP_VERSION_TU10X 25467803U +#define APP_VERSION_TU10X 25453641U #define APP_VERSION_GV11B 25005711U -#define APP_VERSION_GV10X 25611872U +#define APP_VERSION_GV10X 25133717U #define APP_VERSION_GP10X 24076634U #define APP_VERSION_GP10B 23782727U #define APP_VERSION_GM20B 20490253U diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index daa785d1c..3ae6b4eb8 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -1175,7 +1175,6 @@ int gv100_init_hal(struct gk20a *g) nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, false); nvgpu_set_enabled(g, NVGPU_SUPPORT_MULTIPLE_WPR, false); nvgpu_set_enabled(g, NVGPU_FECS_TRACE_VA, true); - nvgpu_set_enabled(g, NVGPU_SUPPORT_PMU_RTOS_FBQ, true); /* for now */ nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, true); diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index 9faa5f59d..5fab3558a 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -1211,7 +1211,7 @@ int tu104_init_hal(struct gk20a *g) nvgpu_set_enabled(g, NVGPU_SUPPORT_MULTIPLE_WPR, true); nvgpu_set_enabled(g, NVGPU_FECS_TRACE_VA, true); nvgpu_set_enabled(g, NVGPU_SUPPORT_SEC2_RTOS, true); - nvgpu_set_enabled(g, NVGPU_SUPPORT_PMU_RTOS_FBQ, true); + nvgpu_set_enabled(g, NVGPU_SUPPORT_PMU_RTOS_FBQ, false); /* for now */ gops->clk.support_clk_freq_controller = false;