diff options
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.nvgpu-t18x | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/fb_gp106.c | 25 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/fb_gp106.h | 19 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 4 |
4 files changed, 47 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu-t18x b/drivers/gpu/nvgpu/Makefile.nvgpu-t18x index cd4ce5ce..167a0ae2 100644 --- a/drivers/gpu/nvgpu/Makefile.nvgpu-t18x +++ b/drivers/gpu/nvgpu/Makefile.nvgpu-t18x | |||
@@ -28,6 +28,7 @@ nvgpu-y += \ | |||
28 | $(nvgpu-t18x)/gp106/sec2_gp106.o \ | 28 | $(nvgpu-t18x)/gp106/sec2_gp106.o \ |
29 | $(nvgpu-t18x)/gp106/fifo_gp106.o \ | 29 | $(nvgpu-t18x)/gp106/fifo_gp106.o \ |
30 | $(nvgpu-t18x)/gp106/ltc_gp106.o \ | 30 | $(nvgpu-t18x)/gp106/ltc_gp106.o \ |
31 | $(nvgpu-t18x)/gp106/fb_gp106.o \ | ||
31 | $(nvgpu-t18x)/clk/clk_mclk.o \ | 32 | $(nvgpu-t18x)/clk/clk_mclk.o \ |
32 | $(nvgpu-t18x)/pstate/pstate.o \ | 33 | $(nvgpu-t18x)/pstate/pstate.o \ |
33 | $(nvgpu-t18x)/clk/clk_vin.o \ | 34 | $(nvgpu-t18x)/clk/clk_vin.o \ |
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.c b/drivers/gpu/nvgpu/gp106/fb_gp106.c new file mode 100644 index 00000000..1c5b3e0a --- /dev/null +++ b/drivers/gpu/nvgpu/gp106/fb_gp106.c | |||
@@ -0,0 +1,25 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms and conditions of the GNU General Public License, | ||
6 | * version 2, as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | */ | ||
13 | |||
14 | #include <linux/types.h> | ||
15 | |||
16 | #include "gk20a/gk20a.h" | ||
17 | #include "gp10b/fb_gp10b.h" | ||
18 | |||
19 | void gp106_init_fb(struct gpu_ops *gops) | ||
20 | { | ||
21 | gp10b_init_fb(gops); | ||
22 | |||
23 | gops->fb.init_fs_state = NULL; | ||
24 | gops->fb.reset = NULL; | ||
25 | } | ||
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.h b/drivers/gpu/nvgpu/gp106/fb_gp106.h new file mode 100644 index 00000000..87b371e1 --- /dev/null +++ b/drivers/gpu/nvgpu/gp106/fb_gp106.h | |||
@@ -0,0 +1,19 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms and conditions of the GNU General Public License, | ||
6 | * version 2, as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | */ | ||
13 | |||
14 | #ifndef FB_GP106_H | ||
15 | #define FB_GP106_H | ||
16 | struct gpu_ops; | ||
17 | |||
18 | void gp106_init_fb(struct gpu_ops *gops); | ||
19 | #endif | ||
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 6c8ac7bc..5f15a2c8 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "gp106/ltc_gp106.h" | 25 | #include "gp106/ltc_gp106.h" |
26 | #include "gp10b/mm_gp10b.h" | 26 | #include "gp10b/mm_gp10b.h" |
27 | #include "gp10b/ce_gp10b.h" | 27 | #include "gp10b/ce_gp10b.h" |
28 | #include "gp10b/fb_gp10b.h" | ||
29 | #include "gp106/fifo_gp106.h" | 28 | #include "gp106/fifo_gp106.h" |
30 | #include "gp10b/gp10b_gating_reglist.h" | 29 | #include "gp10b/gp10b_gating_reglist.h" |
31 | #include "gp10b/regops_gp10b.h" | 30 | #include "gp10b/regops_gp10b.h" |
@@ -43,6 +42,7 @@ | |||
43 | #include "gp106/pmu_gp106.h" | 42 | #include "gp106/pmu_gp106.h" |
44 | #include "gp106/gr_ctx_gp106.h" | 43 | #include "gp106/gr_ctx_gp106.h" |
45 | #include "gp106/gr_gp106.h" | 44 | #include "gp106/gr_gp106.h" |
45 | #include "gp106/fb_gp106.h" | ||
46 | #include "nvgpu_gpuid_t18x.h" | 46 | #include "nvgpu_gpuid_t18x.h" |
47 | #include "hw_proj_gp106.h" | 47 | #include "hw_proj_gp106.h" |
48 | #include "gk20a/dbg_gpu_gk20a.h" | 48 | #include "gk20a/dbg_gpu_gk20a.h" |
@@ -148,7 +148,7 @@ int gp106_init_hal(struct gk20a *g) | |||
148 | gp10b_init_mc(gops); | 148 | gp10b_init_mc(gops); |
149 | gp106_init_gr(gops); | 149 | gp106_init_gr(gops); |
150 | gp106_init_ltc(gops); | 150 | gp106_init_ltc(gops); |
151 | gp10b_init_fb(gops); | 151 | gp106_init_fb(gops); |
152 | gp106_init_fifo(gops); | 152 | gp106_init_fifo(gops); |
153 | gp10b_init_ce(gops); | 153 | gp10b_init_ce(gops); |
154 | gp106_init_gr_ctx(gops); | 154 | gp106_init_gr_ctx(gops); |