diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-11-24 03:08:06 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-27 04:49:28 -0500 |
commit | fda4f49f393d94ff34ccf4e714caf2795229a75a (patch) | |
tree | 0c64d5eac066a4e05b93cbd718d6f885c7aecd06 | |
parent | 6194cfdef52afcb17aa2921685f370e4c5d27819 (diff) |
gpu: nvgpu: move gv11b platform specific file to linux
gv11b/platform_gv11b_tegra.c is mostly linux specific so move it to linux
specific directory
Change-Id: I3e10bafcf672967e35a7955038cd9285b8697a57
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1604283
GVS: Gerrit_Virtual_Submit
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c (renamed from drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c) | 37 |
2 files changed, 17 insertions, 22 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index a4ef22e5..29966d84 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -289,7 +289,7 @@ nvgpu-y += \ | |||
289 | gv100/regops_gv100.o \ | 289 | gv100/regops_gv100.o \ |
290 | gv100/hal_gv100.o | 290 | gv100/hal_gv100.o |
291 | 291 | ||
292 | nvgpu-$(CONFIG_TEGRA_GK20A) += gv11b/platform_gv11b_tegra.o | 292 | nvgpu-$(CONFIG_TEGRA_GK20A) += common/linux/platform_gv11b_tegra.o |
293 | nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += common/linux/nvhost_t19x.o | 293 | nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += common/linux/nvhost_t19x.o |
294 | 294 | ||
295 | nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ | 295 | nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ |
diff --git a/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c index 723e2e80..3c6eac77 100644 --- a/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c | |||
@@ -3,23 +3,17 @@ | |||
3 | * | 3 | * |
4 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * under the terms and conditions of the GNU General Public License, |
8 | * to deal in the Software without restriction, including without limitation | 8 | * version 2, as published by the Free Software Foundation. |
9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
10 | * and/or sell copies of the Software, and to permit persons to whom the | ||
11 | * Software is furnished to do so, subject to the following conditions: | ||
12 | * | 9 | * |
13 | * The above copyright notice and this permission notice shall be included in | 10 | * This program is distributed in the hope it will be useful, but WITHOUT |
14 | * all copies or substantial portions of the Software. | 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
13 | * more details. | ||
15 | * | 14 | * |
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 15 | * You should have received a copy of the GNU General Public License |
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
19 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
22 | * DEALINGS IN THE SOFTWARE. | ||
23 | */ | 17 | */ |
24 | 18 | ||
25 | #include <linux/of_platform.h> | 19 | #include <linux/of_platform.h> |
@@ -29,6 +23,7 @@ | |||
29 | #include <linux/reset.h> | 23 | #include <linux/reset.h> |
30 | #include <linux/hashtable.h> | 24 | #include <linux/hashtable.h> |
31 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
26 | |||
32 | #include <nvgpu/nvhost.h> | 27 | #include <nvgpu/nvhost.h> |
33 | #include <nvgpu/nvhost_t19x.h> | 28 | #include <nvgpu/nvhost_t19x.h> |
34 | 29 | ||
@@ -38,15 +33,15 @@ | |||
38 | #include <soc/tegra/tegra_powergate.h> | 33 | #include <soc/tegra/tegra_powergate.h> |
39 | 34 | ||
40 | #include "gk20a/gk20a.h" | 35 | #include "gk20a/gk20a.h" |
41 | #include "common/linux/platform_gk20a.h" | 36 | #include "platform_gk20a.h" |
42 | #include "common/linux/clk.h" | 37 | #include "clk.h" |
43 | 38 | ||
44 | #include "gp10b/platform_gp10b.h" | 39 | #include "gp10b/platform_gp10b.h" |
45 | #include "common/linux/platform_gp10b_tegra.h" | 40 | #include "platform_gp10b_tegra.h" |
46 | 41 | ||
47 | #include "common/linux/os_linux.h" | 42 | #include "os_linux.h" |
48 | #include "common/linux/platform_gk20a_tegra.h" | 43 | #include "platform_gk20a_tegra.h" |
49 | #include "gr_gv11b.h" | 44 | #include "gv11b/gr_gv11b.h" |
50 | #include "nvgpu_gpuid_t19x.h" | 45 | #include "nvgpu_gpuid_t19x.h" |
51 | 46 | ||
52 | static void gr_gv11b_remove_sysfs(struct device *dev); | 47 | static void gr_gv11b_remove_sysfs(struct device *dev); |