diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 05:21:20 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-12-28 06:15:58 -0500 |
commit | afe77b34454746d3017076e55e166a5f83c7f0f6 (patch) | |
tree | a485ee4d7463409ee84796316625667666961d7e /drivers/gpu | |
parent | 7a81883a0d70c3a43ad2841ac235f6dc344c60fb (diff) |
gpu: nvgpu: compile local t18x code
Compile local t18x code from nvgpu repo (in case
CONFIG_ARCH_TEGRA_18x_SOC config is set)
instead of compiling from $(srctree)/../nvgpu-t18x
Remove Makefile.nvgpu-t18x since this Makefile is
not needed now
Bug 200266498
Change-Id: Ib8ef39be7e948debe0ff895c904a6c370a5711a6
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1277119
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.nvgpu | 85 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.nvgpu-t18x | 75 |
2 files changed, 73 insertions, 87 deletions
diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu index b6420dac..93629eff 100644 --- a/drivers/gpu/nvgpu/Makefile.nvgpu +++ b/drivers/gpu/nvgpu/Makefile.nvgpu | |||
@@ -13,12 +13,6 @@ ifeq ($(VERSION),4) | |||
13 | ccflags-y += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers | 13 | ccflags-y += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers |
14 | endif | 14 | endif |
15 | 15 | ||
16 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) | ||
17 | ccflags-y += -I$(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu | ||
18 | ccflags-y += -I$(srctree)/../nvgpu-t18x/include | ||
19 | ccflags-y += -I$(srctree)/../nvgpu-t18x/include/uapi | ||
20 | endif | ||
21 | |||
22 | ifeq ($(CONFIG_TEGRA_19x_GPU),y) | 16 | ifeq ($(CONFIG_TEGRA_19x_GPU),y) |
23 | ccflags-y += -I$(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu | 17 | ccflags-y += -I$(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu |
24 | ccflags-y += -I$(srctree)/../nvgpu-t19x/include | 18 | ccflags-y += -I$(srctree)/../nvgpu-t19x/include |
@@ -135,12 +129,79 @@ nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \ | |||
135 | gk20a/css_gr_gk20a.o | 129 | gk20a/css_gr_gk20a.o |
136 | 130 | ||
137 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) | 131 | ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) |
138 | ifneq ($(wildcard $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile),) | 132 | nvgpu-y += \ |
139 | include $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile | 133 | gp10b/gr_gp10b.o \ |
140 | endif | 134 | gp10b/gr_ctx_gp10b.o \ |
141 | ifneq ($(wildcard $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile.nvgpu-t18x),) | 135 | gp10b/ce_gp10b.o \ |
142 | include $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile.nvgpu-t18x | 136 | gp10b/mc_gp10b.o \ |
143 | endif | 137 | gp10b/fifo_gp10b.o \ |
138 | gp10b/ltc_gp10b.o \ | ||
139 | gp10b/mm_gp10b.o \ | ||
140 | gp10b/fb_gp10b.o \ | ||
141 | gp10b/pmu_gp10b.o \ | ||
142 | gp10b/hal_gp10b.o \ | ||
143 | gp10b/rpfb_gp10b.o \ | ||
144 | gp10b/gp10b_gating_reglist.o \ | ||
145 | gp10b/regops_gp10b.o \ | ||
146 | gp10b/cde_gp10b.o \ | ||
147 | gp10b/therm_gp10b.o \ | ||
148 | gp10b/fecs_trace_gp10b.o \ | ||
149 | gp10b/gp10b_sysfs.o \ | ||
150 | gp10b/gp10b.o \ | ||
151 | gp106/hal_gp106.o \ | ||
152 | gp106/mm_gp106.o \ | ||
153 | gp106/pmu_gp106.o \ | ||
154 | gp106/gr_gp106.o \ | ||
155 | gp106/gr_ctx_gp106.o \ | ||
156 | gp106/acr_gp106.o \ | ||
157 | gp106/sec2_gp106.o \ | ||
158 | gp106/fifo_gp106.o \ | ||
159 | gp106/ltc_gp106.o \ | ||
160 | gp106/fb_gp106.o \ | ||
161 | gp106/bios_gp106.o \ | ||
162 | gp106/regops_gp106.o \ | ||
163 | clk/clk_mclk.o \ | ||
164 | pstate/pstate.o \ | ||
165 | clk/clk_vin.o \ | ||
166 | clk/clk_fll.o \ | ||
167 | clk/clk_domain.o \ | ||
168 | clk/clk_prog.o \ | ||
169 | clk/clk_vf_point.o \ | ||
170 | clk/clk_arb.o \ | ||
171 | clk/clk_freq_controller.o \ | ||
172 | perf/vfe_var.o \ | ||
173 | perf/vfe_equ.o \ | ||
174 | perf/perf.o \ | ||
175 | clk/clk.o \ | ||
176 | gp106/clk_gp106.o \ | ||
177 | gp106/clk_arb_gp106.o \ | ||
178 | gp106/gp106_gating_reglist.o \ | ||
179 | gp106/xve_gp106.o \ | ||
180 | gp106/therm_gp106.o \ | ||
181 | gp106/xve_gp106.o \ | ||
182 | pmgr/pwrdev.o \ | ||
183 | pmgr/pmgr.o \ | ||
184 | pmgr/pmgrpmu.o \ | ||
185 | pmgr/pwrmonitor.o \ | ||
186 | pmgr/pwrpolicy.o \ | ||
187 | volt/volt_rail.o \ | ||
188 | volt/volt_dev.o \ | ||
189 | volt/volt_policy.o \ | ||
190 | volt/volt_pmu.o \ | ||
191 | therm/thrm.o \ | ||
192 | therm/thrmdev.o \ | ||
193 | therm/thrmchannel.o \ | ||
194 | therm/thrmpmu.o \ | ||
195 | lpwr/rppg.o \ | ||
196 | lpwr/lpwr.o | ||
197 | |||
198 | nvgpu-$(CONFIG_TEGRA_GK20A) += gp10b/platform_gp10b_tegra.o | ||
199 | |||
200 | nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ | ||
201 | vgpu/gp10b/vgpu_hal_gp10b.o \ | ||
202 | vgpu/gp10b/vgpu_gr_gp10b.o \ | ||
203 | vgpu/gp10b/vgpu_mm_gp10b.o \ | ||
204 | vgpu/gp10b/vgpu_fifo_gp10b.o | ||
144 | endif | 205 | endif |
145 | 206 | ||
146 | ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) | 207 | ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y) |
diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu-t18x b/drivers/gpu/nvgpu/Makefile.nvgpu-t18x deleted file mode 100644 index 30119345..00000000 --- a/drivers/gpu/nvgpu/Makefile.nvgpu-t18x +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | nvgpu-t18x := $(call tegra-path,nvgpu-t18x,drivers/gpu/nvgpu) | ||
2 | |||
3 | nvgpu-y += \ | ||
4 | $(nvgpu-t18x)/gp10b/gr_gp10b.o \ | ||
5 | $(nvgpu-t18x)/gp10b/gr_ctx_gp10b.o \ | ||
6 | $(nvgpu-t18x)/gp10b/ce_gp10b.o \ | ||
7 | $(nvgpu-t18x)/gp10b/mc_gp10b.o \ | ||
8 | $(nvgpu-t18x)/gp10b/fifo_gp10b.o \ | ||
9 | $(nvgpu-t18x)/gp10b/ltc_gp10b.o \ | ||
10 | $(nvgpu-t18x)/gp10b/mm_gp10b.o \ | ||
11 | $(nvgpu-t18x)/gp10b/fb_gp10b.o \ | ||
12 | $(nvgpu-t18x)/gp10b/pmu_gp10b.o \ | ||
13 | $(nvgpu-t18x)/gp10b/hal_gp10b.o \ | ||
14 | $(nvgpu-t18x)/gp10b/rpfb_gp10b.o \ | ||
15 | $(nvgpu-t18x)/gp10b/gp10b_gating_reglist.o \ | ||
16 | $(nvgpu-t18x)/gp10b/regops_gp10b.o \ | ||
17 | $(nvgpu-t18x)/gp10b/cde_gp10b.o \ | ||
18 | $(nvgpu-t18x)/gp10b/therm_gp10b.o \ | ||
19 | $(nvgpu-t18x)/gp10b/fecs_trace_gp10b.o \ | ||
20 | $(nvgpu-t18x)/gp10b/gp10b_sysfs.o \ | ||
21 | $(nvgpu-t18x)/gp10b/gp10b.o \ | ||
22 | $(nvgpu-t18x)/gp106/hal_gp106.o \ | ||
23 | $(nvgpu-t18x)/gp106/mm_gp106.o \ | ||
24 | $(nvgpu-t18x)/gp106/pmu_gp106.o \ | ||
25 | $(nvgpu-t18x)/gp106/gr_gp106.o \ | ||
26 | $(nvgpu-t18x)/gp106/gr_ctx_gp106.o \ | ||
27 | $(nvgpu-t18x)/gp106/acr_gp106.o \ | ||
28 | $(nvgpu-t18x)/gp106/sec2_gp106.o \ | ||
29 | $(nvgpu-t18x)/gp106/fifo_gp106.o \ | ||
30 | $(nvgpu-t18x)/gp106/ltc_gp106.o \ | ||
31 | $(nvgpu-t18x)/gp106/fb_gp106.o \ | ||
32 | $(nvgpu-t18x)/gp106/bios_gp106.o \ | ||
33 | $(nvgpu-t18x)/gp106/regops_gp106.o \ | ||
34 | $(nvgpu-t18x)/clk/clk_mclk.o \ | ||
35 | $(nvgpu-t18x)/pstate/pstate.o \ | ||
36 | $(nvgpu-t18x)/clk/clk_vin.o \ | ||
37 | $(nvgpu-t18x)/clk/clk_fll.o \ | ||
38 | $(nvgpu-t18x)/clk/clk_domain.o \ | ||
39 | $(nvgpu-t18x)/clk/clk_prog.o \ | ||
40 | $(nvgpu-t18x)/clk/clk_vf_point.o \ | ||
41 | $(nvgpu-t18x)/clk/clk_arb.o \ | ||
42 | $(nvgpu-t18x)/clk/clk_freq_controller.o \ | ||
43 | $(nvgpu-t18x)/perf/vfe_var.o \ | ||
44 | $(nvgpu-t18x)/perf/vfe_equ.o \ | ||
45 | $(nvgpu-t18x)/perf/perf.o \ | ||
46 | $(nvgpu-t18x)/clk/clk.o \ | ||
47 | $(nvgpu-t18x)/gp106/clk_gp106.o \ | ||
48 | $(nvgpu-t18x)/gp106/clk_arb_gp106.o \ | ||
49 | $(nvgpu-t18x)/gp106/gp106_gating_reglist.o \ | ||
50 | $(nvgpu-t18x)/gp106/xve_gp106.o \ | ||
51 | $(nvgpu-t18x)/gp106/therm_gp106.o \ | ||
52 | $(nvgpu-t18x)/gp106/xve_gp106.o \ | ||
53 | $(nvgpu-t18x)/pmgr/pwrdev.o \ | ||
54 | $(nvgpu-t18x)/pmgr/pmgr.o \ | ||
55 | $(nvgpu-t18x)/pmgr/pmgrpmu.o \ | ||
56 | $(nvgpu-t18x)/pmgr/pwrmonitor.o \ | ||
57 | $(nvgpu-t18x)/pmgr/pwrpolicy.o \ | ||
58 | $(nvgpu-t18x)/volt/volt_rail.o \ | ||
59 | $(nvgpu-t18x)/volt/volt_dev.o \ | ||
60 | $(nvgpu-t18x)/volt/volt_policy.o \ | ||
61 | $(nvgpu-t18x)/volt/volt_pmu.o \ | ||
62 | $(nvgpu-t18x)/therm/thrm.o \ | ||
63 | $(nvgpu-t18x)/therm/thrmdev.o \ | ||
64 | $(nvgpu-t18x)/therm/thrmchannel.o \ | ||
65 | $(nvgpu-t18x)/therm/thrmpmu.o \ | ||
66 | $(nvgpu-t18x)/lpwr/rppg.o \ | ||
67 | $(nvgpu-t18x)/lpwr/lpwr.o | ||
68 | |||
69 | nvgpu-$(CONFIG_TEGRA_GK20A) += $(nvgpu-t18x)/gp10b/platform_gp10b_tegra.o | ||
70 | |||
71 | nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ | ||
72 | $(nvgpu-t18x)/vgpu/gp10b/vgpu_hal_gp10b.o \ | ||
73 | $(nvgpu-t18x)/vgpu/gp10b/vgpu_gr_gp10b.o \ | ||
74 | $(nvgpu-t18x)/vgpu/gp10b/vgpu_mm_gp10b.o \ | ||
75 | $(nvgpu-t18x)/vgpu/gp10b/vgpu_fifo_gp10b.o | ||