nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: s/CONFIG_GK20A_PCI/CONFIG_NVGPU_DGPU

Browse Source 
Replace the redundant config GK20A_PCI with NVGPU_DGPU.

Bug 200658918

Change-Id: Ie1af1c97edf96ff4d16e51170a1200623da88e2e
Signed-off-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2419564
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Vaibhav Kachore <vkachore@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Sagar Kamble
2020-09-25 11:34:26 +05:30
committed by Alex Waterman
parent 992b848ba6
commit 807fbd3654
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/nvgpu/Makefile
View File

@@ -81,6 +81,8 @@ obj-$(CONFIG_GK20A) := nvgpu.o
ifeq ($(CONFIG_NVGPU_DGPU),y) ifeq ($(CONFIG_NVGPU_DGPU),y)
nvgpu-$(CONFIG_NVGPU_DGPU) += \ nvgpu-$(CONFIG_NVGPU_DGPU) += \
os/linux/pci.o \
os/linux/pci_power.o \
os/linux/dmabuf_vidmem.o \ os/linux/dmabuf_vidmem.o \
os/linux/os_ops_gv100.o \ os/linux/os_ops_gv100.o \
os/linux/os_ops_tu104.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_gv100.o \
hal/nvlink/link_mode_transitions_tu104.o hal/nvlink/link_mode_transitions_tu104.o
nvgpu-$(CONFIG_GK20A_PCI) += \
os/linux/pci.o \
os/linux/pci_power.o
nvgpu-y += \ nvgpu-y += \
common/device.o \ common/device.o \
common/utils/enabled.o \ common/utils/enabled.o \

5
drivers/gpu/nvgpu/Makefile.linux.configs
View File

@@ -72,8 +72,6 @@ endif
# Enable support for GPUs on PCIe bus. # Enable support for GPUs on PCIe bus.
ifeq ($(CONFIG_PCI),y) ifeq ($(CONFIG_PCI),y)
CONFIG_GK20A_PCI := y
# Support for NVGPU DGPU # Support for NVGPU DGPU
CONFIG_NVGPU_DGPU := y CONFIG_NVGPU_DGPU := y
endif endif
@@ -187,9 +185,6 @@ endif
ifeq ($(CONFIG_TEGRA_GK20A_NVHOST),y) ifeq ($(CONFIG_TEGRA_GK20A_NVHOST),y)
ccflags-y += -DCONFIG_TEGRA_GK20A_NVHOST ccflags-y += -DCONFIG_TEGRA_GK20A_NVHOST
endif endif
ifeq ($(CONFIG_GK20A_PCI),y)
ccflags-y += -DCONFIG_GK20A_PCI
endif
ifeq ($(CONFIG_NVGPU_DGPU),y) ifeq ($(CONFIG_NVGPU_DGPU),y)
ccflags-y += -DCONFIG_NVGPU_DGPU ccflags-y += -DCONFIG_NVGPU_DGPU
endif endif

4
drivers/gpu/nvgpu/os/linux/pci.h
View File

@@ -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 * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -16,7 +16,7 @@
#ifndef NVGPU_PCI_H #ifndef NVGPU_PCI_H
#define NVGPU_PCI_H #define NVGPU_PCI_H
#ifdef CONFIG_GK20A_PCI #ifdef CONFIG_NVGPU_DGPU
int nvgpu_pci_init(void); int nvgpu_pci_init(void);
void nvgpu_pci_exit(void); void nvgpu_pci_exit(void);
#else #else