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

Revert "WAR: gpu: nvgpu: disable MSI for kernel 4.14"

Browse Source 
This reverts commit 0a90a5c5a9.

Bug 2462165

Change-Id: I8076353c862b77011abbfe9aca9f35e0c556be48
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1990597
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Thomas Fleury
2019-01-08 15:11:03 -08:00
committed by mobile promotions
parent ccf114fa4e
commit fb9b88e5a3
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -578,9 +578,6 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
g->ina3221_i2c_port = platform->ina3221_i2c_port; g->ina3221_i2c_port = platform->ina3221_i2c_port;
g->hardcode_sw_threshold = platform->hardcode_sw_threshold; g->hardcode_sw_threshold = platform->hardcode_sw_threshold;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
nvgpu_info(g, "MSI are disabled");
#else
#if defined(CONFIG_PCI_MSI) #if defined(CONFIG_PCI_MSI)
err = pci_enable_msi(pdev); err = pci_enable_msi(pdev);
if (err) { if (err) {
@@ -589,7 +586,6 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
g->msi_enabled = false; g->msi_enabled = false;
} else } else
g->msi_enabled = true; g->msi_enabled = true;
#endif
#endif #endif
g->irq_stall = pdev->irq; g->irq_stall = pdev->irq;