From 807fbd36549fb3c726c5ef56b15850a826f703ff Mon Sep 17 00:00:00 2001 From: Sagar Kamble Date: Fri, 25 Sep 2020 11:34:26 +0530 Subject: [PATCH] gpu: nvgpu: s/CONFIG_GK20A_PCI/CONFIG_NVGPU_DGPU Replace the redundant config GK20A_PCI with NVGPU_DGPU. Bug 200658918 Change-Id: Ie1af1c97edf96ff4d16e51170a1200623da88e2e Signed-off-by: Sagar Kamble Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2419564 Reviewed-by: automaticguardword Reviewed-by: Deepak Nibade Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Waterman Reviewed-by: Vaibhav Kachore Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/Makefile | 6 ++---- drivers/gpu/nvgpu/Makefile.linux.configs | 5 ----- drivers/gpu/nvgpu/os/linux/pci.h | 4 ++-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index d97a10646..cbea8a6e6 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -81,6 +81,8 @@ obj-$(CONFIG_GK20A) := nvgpu.o ifeq ($(CONFIG_NVGPU_DGPU),y) nvgpu-$(CONFIG_NVGPU_DGPU) += \ + os/linux/pci.o \ + os/linux/pci_power.o \ os/linux/dmabuf_vidmem.o \ os/linux/os_ops_gv100.o \ os/linux/os_ops_tu104.o \ @@ -180,10 +182,6 @@ nvgpu-y += \ hal/nvlink/link_mode_transitions_gv100.o \ hal/nvlink/link_mode_transitions_tu104.o -nvgpu-$(CONFIG_GK20A_PCI) += \ - os/linux/pci.o \ - os/linux/pci_power.o - nvgpu-y += \ common/device.o \ common/utils/enabled.o \ diff --git a/drivers/gpu/nvgpu/Makefile.linux.configs b/drivers/gpu/nvgpu/Makefile.linux.configs index 7fdd7b6a6..f6137d661 100644 --- a/drivers/gpu/nvgpu/Makefile.linux.configs +++ b/drivers/gpu/nvgpu/Makefile.linux.configs @@ -72,8 +72,6 @@ endif # Enable support for GPUs on PCIe bus. ifeq ($(CONFIG_PCI),y) -CONFIG_GK20A_PCI := y - # Support for NVGPU DGPU CONFIG_NVGPU_DGPU := y endif @@ -187,9 +185,6 @@ endif ifeq ($(CONFIG_TEGRA_GK20A_NVHOST),y) ccflags-y += -DCONFIG_TEGRA_GK20A_NVHOST endif -ifeq ($(CONFIG_GK20A_PCI),y) -ccflags-y += -DCONFIG_GK20A_PCI -endif ifeq ($(CONFIG_NVGPU_DGPU),y) ccflags-y += -DCONFIG_NVGPU_DGPU endif diff --git a/drivers/gpu/nvgpu/os/linux/pci.h b/drivers/gpu/nvgpu/os/linux/pci.h index cc6b77b1b..d4456ba61 100644 --- a/drivers/gpu/nvgpu/os/linux/pci.h +++ b/drivers/gpu/nvgpu/os/linux/pci.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2020, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -16,7 +16,7 @@ #ifndef NVGPU_PCI_H #define NVGPU_PCI_H -#ifdef CONFIG_GK20A_PCI +#ifdef CONFIG_NVGPU_DGPU int nvgpu_pci_init(void); void nvgpu_pci_exit(void); #else