From 4d5e8de53760c76a2c050a10d2cd6f2314f4f774 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Thu, 20 Aug 2020 08:29:11 +0100 Subject: [PATCH] gpu: nvgpu: Fix building NVGPU when NVHost is a module If NVHost is built as a module then NVGPU is built without support for NVHost because the Makefile for NVGPU is only enabling NVHost support when NVHost is built into the kernel. Fix this by enabling support in NVGPU for NVHost when NVHost is built into the kernel or as a module. Bug 200617256 Change-Id: I7226daa8b4815147a465d5b3fd3ac3e3cdae8d36 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2401332 Reviewed-by: automaticguardword Reviewed-by: Debarshi Dutta Reviewed-by: Sagar Kamble Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/Makefile.linux.configs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.linux.configs b/drivers/gpu/nvgpu/Makefile.linux.configs index 9d9eb8a87..c38b3784e 100644 --- a/drivers/gpu/nvgpu/Makefile.linux.configs +++ b/drivers/gpu/nvgpu/Makefile.linux.configs @@ -75,7 +75,7 @@ CONFIG_NVGPU_FECS_TRACE := y # Enable support in GK20A for the nvhost (host1x) dma engine hardware # that includes things like hardware syncpts. This requires # TEGRA_GRHOST -ifeq ($(CONFIG_TEGRA_GRHOST),y) +ifdef CONFIG_TEGRA_GRHOST CONFIG_TEGRA_GK20A_NVHOST := y endif @@ -240,4 +240,4 @@ ccflags-y += -DCONFIG_NVGPU_SYNCFD_STABLE endif ifeq ($(CONFIG_NVGPU_SYNCFD_NONE),y) ccflags-y += -DCONFIG_NVGPU_SYNCFD_NONE -endif \ No newline at end of file +endif