summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-08-22 11:31:32 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-08-22 15:44:41 -0400
commitbc87e8989ddf2f74ff2c988a25e4a81e559a5c30 (patch)
treeb8c45cecf50e3e3bb8967952de9f5047de60683f /drivers/gpu/nvgpu/common
parent587666bd6cbb60e52698052c2b5c4a74f2165ecd (diff)
gpu: nvgpu: Remove support for old kernel version
Remove support for pre-4.4 kernels. This allows deleting the checks for kernel version, and usage of linux/version.h. Change-Id: I4d6cb30512ea164d27549f4f4d096e5931bb1379 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1543499 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r--drivers/gpu/nvgpu/common/linux/clk.c1
-rw-r--r--drivers/gpu/nvgpu/common/linux/dma.c1
-rw-r--r--drivers/gpu/nvgpu/common/linux/firmware.c4
-rw-r--r--drivers/gpu/nvgpu/common/linux/module.c2
-rw-r--r--drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c5
-rw-r--r--drivers/gpu/nvgpu/common/linux/sysfs.c1
6 files changed, 1 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/clk.c b/drivers/gpu/nvgpu/common/linux/clk.c
index 892b892a..3f768867 100644
--- a/drivers/gpu/nvgpu/common/linux/clk.c
+++ b/drivers/gpu/nvgpu/common/linux/clk.c
@@ -17,7 +17,6 @@
17 */ 17 */
18 18
19#include <linux/clk.h> 19#include <linux/clk.h>
20#include <linux/version.h>
21 20
22#include <soc/tegra/tegra-dvfs.h> 21#include <soc/tegra/tegra-dvfs.h>
23 22
diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c
index 2116053d..cd6ad1b2 100644
--- a/drivers/gpu/nvgpu/common/linux/dma.c
+++ b/drivers/gpu/nvgpu/common/linux/dma.c
@@ -16,6 +16,7 @@
16 16
17#include <linux/dma-attrs.h> 17#include <linux/dma-attrs.h>
18#include <linux/dma-mapping.h> 18#include <linux/dma-mapping.h>
19#include <linux/version.h>
19 20
20#include <nvgpu/dma.h> 21#include <nvgpu/dma.h>
21#include <nvgpu/lock.h> 22#include <nvgpu/lock.h>
diff --git a/drivers/gpu/nvgpu/common/linux/firmware.c b/drivers/gpu/nvgpu/common/linux/firmware.c
index b49bc4a3..44ff1507 100644
--- a/drivers/gpu/nvgpu/common/linux/firmware.c
+++ b/drivers/gpu/nvgpu/common/linux/firmware.c
@@ -44,14 +44,10 @@ static const struct firmware *do_request_firmware(struct device *dev,
44 fw_name = fw_path; 44 fw_name = fw_path;
45 } 45 }
46 46
47#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
48 err = request_firmware(&fw, fw_name, dev);
49#else
50 if (flags & NVGPU_REQUEST_FIRMWARE_NO_WARN) 47 if (flags & NVGPU_REQUEST_FIRMWARE_NO_WARN)
51 err = request_firmware_direct(&fw, fw_name, dev); 48 err = request_firmware_direct(&fw, fw_name, dev);
52 else 49 else
53 err = request_firmware(&fw, fw_name, dev); 50 err = request_firmware(&fw, fw_name, dev);
54#endif
55 51
56 nvgpu_kfree(get_gk20a(dev), fw_path); 52 nvgpu_kfree(get_gk20a(dev), fw_path);
57 if (err) 53 if (err)
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index f5c6ca1f..691fdd69 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -1025,9 +1025,7 @@ static struct platform_driver gk20a_driver = {
1025 .driver = { 1025 .driver = {
1026 .owner = THIS_MODULE, 1026 .owner = THIS_MODULE,
1027 .name = "gk20a", 1027 .name = "gk20a",
1028#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
1029 .probe_type = PROBE_PREFER_ASYNCHRONOUS, 1028 .probe_type = PROBE_PREFER_ASYNCHRONOUS,
1030#endif
1031#ifdef CONFIG_OF 1029#ifdef CONFIG_OF
1032 .of_match_table = tegra_gk20a_of_match, 1030 .of_match_table = tegra_gk20a_of_match,
1033#endif 1031#endif
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
index 71081be5..2c556d8a 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
@@ -13,7 +13,6 @@
13 * more details. 13 * more details.
14 */ 14 */
15 15
16#include <linux/version.h>
17#include <linux/of_platform.h> 16#include <linux/of_platform.h>
18#include <linux/debugfs.h> 17#include <linux/debugfs.h>
19#include <linux/platform_data/tegra_edp.h> 18#include <linux/platform_data/tegra_edp.h>
@@ -822,10 +821,8 @@ static int gk20a_tegra_probe(struct device *dev)
822 dev_warn(dev, "board does not support scaling"); 821 dev_warn(dev, "board does not support scaling");
823 } 822 }
824 platform->g->clk.gpc_pll.id = GM20B_GPC_PLL_B1; 823 platform->g->clk.gpc_pll.id = GM20B_GPC_PLL_B1;
825#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
826 if (tegra_chip_get_revision() > TEGRA210_REVISION_A04p) 824 if (tegra_chip_get_revision() > TEGRA210_REVISION_A04p)
827 platform->g->clk.gpc_pll.id = GM20B_GPC_PLL_C1; 825 platform->g->clk.gpc_pll.id = GM20B_GPC_PLL_C1;
828#endif
829 } 826 }
830 827
831 if (tegra_get_chip_id() == TEGRA132) 828 if (tegra_get_chip_id() == TEGRA132)
@@ -841,9 +838,7 @@ static int gk20a_tegra_probe(struct device *dev)
841 return ret; 838 return ret;
842 } 839 }
843 840
844#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
845 pmc = ioremap(TEGRA_PMC_BASE, 4096); 841 pmc = ioremap(TEGRA_PMC_BASE, 4096);
846#endif
847 842
848 return 0; 843 return 0;
849} 844}
diff --git a/drivers/gpu/nvgpu/common/linux/sysfs.c b/drivers/gpu/nvgpu/common/linux/sysfs.c
index 28ebb21d..1b59c480 100644
--- a/drivers/gpu/nvgpu/common/linux/sysfs.c
+++ b/drivers/gpu/nvgpu/common/linux/sysfs.c
@@ -14,7 +14,6 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include <linux/version.h>
18#include <linux/device.h> 17#include <linux/device.h>
19#include <linux/pm_runtime.h> 18#include <linux/pm_runtime.h>
20#include <linux/fb.h> 19#include <linux/fb.h>