From fb9b88e5a3ff8c726b78234f5a5b21c1b2ad95ff Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Tue, 8 Jan 2019 15:11:03 -0800 Subject: [PATCH] Revert "WAR: gpu: nvgpu: disable MSI for kernel 4.14" This reverts commit 0a90a5c5a9a5c71904439d8dd70b931436da44d7. Bug 2462165 Change-Id: I8076353c862b77011abbfe9aca9f35e0c556be48 Signed-off-by: Thomas Fleury Reviewed-on: https://git-master.nvidia.com/r/1990597 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/os/linux/pci.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/nvgpu/os/linux/pci.c b/drivers/gpu/nvgpu/os/linux/pci.c index 63985aa3a..28b545ad4 100644 --- a/drivers/gpu/nvgpu/os/linux/pci.c +++ b/drivers/gpu/nvgpu/os/linux/pci.c @@ -578,9 +578,6 @@ static int nvgpu_pci_probe(struct pci_dev *pdev, g->ina3221_i2c_port = platform->ina3221_i2c_port; 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) err = pci_enable_msi(pdev); if (err) { @@ -589,7 +586,6 @@ static int nvgpu_pci_probe(struct pci_dev *pdev, g->msi_enabled = false; } else g->msi_enabled = true; -#endif #endif g->irq_stall = pdev->irq;