diff options
author | David Nieto <dmartineznie@nvidia.com> | 2016-08-23 13:47:10 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:56:19 -0500 |
commit | 5e486b518292b1178eae49d58a1bc0894788a281 (patch) | |
tree | 83de813bfd0e1cb04fbacb4d10769f7a6b1c5a63 /drivers | |
parent | 6d4851e248f00a0c8188bcaa1375f94ba915f608 (diff) |
gpu: nvgpu: fix cbc base calculation for dGPU
JIRA DNVGPU-9
Change-Id: I22667acfadfcabf79af841ca5389e41d2ac34860
Signed-off-by: David Nieto <dmartineznie@nvidia.com>
Reviewed-on: http://git-master/r/1206478
(cherry picked from commit 098b932f7633a903c915b1257beb9304735b4113)
Reviewed-on: http://git-master/r/1210288
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.nvgpu-t18x | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/ltc_gp106.c | 25 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/ltc_gp106.h | 19 |
4 files changed, 48 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu-t18x b/drivers/gpu/nvgpu/Makefile.nvgpu-t18x index 548a9c0d..e7d18492 100644 --- a/drivers/gpu/nvgpu/Makefile.nvgpu-t18x +++ b/drivers/gpu/nvgpu/Makefile.nvgpu-t18x | |||
@@ -26,7 +26,8 @@ nvgpu-y += \ | |||
26 | $(nvgpu-t18x)/gp106/gr_ctx_gp106.o \ | 26 | $(nvgpu-t18x)/gp106/gr_ctx_gp106.o \ |
27 | $(nvgpu-t18x)/gp106/acr_gp106.o \ | 27 | $(nvgpu-t18x)/gp106/acr_gp106.o \ |
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 | 31 | ||
31 | nvgpu-$(CONFIG_TEGRA_GK20A) += $(nvgpu-t18x)/gp10b/platform_gp10b_tegra.o | 32 | nvgpu-$(CONFIG_TEGRA_GK20A) += $(nvgpu-t18x)/gp10b/platform_gp10b_tegra.o |
32 | 33 | ||
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 5414eb4a..a52fab7b 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #include "gp10b/gr_gp10b.h" | 23 | #include "gp10b/gr_gp10b.h" |
24 | #include "gp10b/mc_gp10b.h" | 24 | #include "gp10b/mc_gp10b.h" |
25 | #include "gp10b/ltc_gp10b.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" | 28 | #include "gp10b/fb_gp10b.h" |
@@ -147,7 +147,7 @@ int gp106_init_hal(struct gk20a *g) | |||
147 | 147 | ||
148 | gp10b_init_mc(gops); | 148 | gp10b_init_mc(gops); |
149 | gp106_init_gr(gops); | 149 | gp106_init_gr(gops); |
150 | gp10b_init_ltc(gops); | 150 | gp106_init_ltc(gops); |
151 | gp10b_init_fb(gops); | 151 | gp10b_init_fb(gops); |
152 | gp106_init_fifo(gops); | 152 | gp106_init_fifo(gops); |
153 | gp10b_init_ce(gops); | 153 | gp10b_init_ce(gops); |
diff --git a/drivers/gpu/nvgpu/gp106/ltc_gp106.c b/drivers/gpu/nvgpu/gp106/ltc_gp106.c new file mode 100644 index 00000000..8f630a41 --- /dev/null +++ b/drivers/gpu/nvgpu/gp106/ltc_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/ltc_gp10b.h" | ||
18 | |||
19 | void gp106_init_ltc(struct gpu_ops *gops) | ||
20 | { | ||
21 | gp10b_init_ltc(gops); | ||
22 | |||
23 | /* dGPU does not need the LTC hack */ | ||
24 | gops->ltc.cbc_fix_config = NULL; | ||
25 | } | ||
diff --git a/drivers/gpu/nvgpu/gp106/ltc_gp106.h b/drivers/gpu/nvgpu/gp106/ltc_gp106.h new file mode 100644 index 00000000..4720d7a1 --- /dev/null +++ b/drivers/gpu/nvgpu/gp106/ltc_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 LTC_GP106_H | ||
15 | #define LTC_GP106_H | ||
16 | struct gpu_ops; | ||
17 | |||
18 | void gp106_init_ltc(struct gpu_ops *gops); | ||
19 | #endif | ||