From 5828594de17bca45fcc790aad7430da2562fa505 Mon Sep 17 00:00:00 2001 From: Tejal Kudav Date: Mon, 4 Jul 2022 19:03:50 +0000 Subject: [PATCH] gpu: nvgpu: Avoid err_inj CB registration for dGPU Error injection is not supported on dGPU and dGPU's probe should not attempt any error injection callback function registration. Disable NvGPU's error injection support on dGPU by checking CONFIG_NVGPU_DGPU. Bug 3703060 Change-Id: Ie6f5af2636396e51000e8c2553d4e58a61c902d6 Signed-off-by: Tejal Kudav Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2739265 Reviewed-by: svcacv Reviewed-by: Kasinadha Dendukuri Reviewed-by: Manish Bhardwaj Reviewed-by: Chandra Meduri Tested-by: Kasinadha Dendukuri --- drivers/gpu/nvgpu/Makefile.linux.configs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/nvgpu/Makefile.linux.configs b/drivers/gpu/nvgpu/Makefile.linux.configs index 0f3c38fc2..4c15d36d9 100644 --- a/drivers/gpu/nvgpu/Makefile.linux.configs +++ b/drivers/gpu/nvgpu/Makefile.linux.configs @@ -199,9 +199,11 @@ endif ifeq ($(CONFIG_TEGRA_HSIERRRPTINJ),y) ifeq ($(CONFIG_NVGPU_ENABLE_MISC_EC),y) +ifeq ($(CONFIG_NVGPU_DGPU),n) CONFIG_NVGPU_FSI_ERR_INJECTION := y endif endif +endif ifeq ($(CONFIG_GK20A_PMU),y) ccflags-y += -DCONFIG_GK20A_PMU