diff options
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 13 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 235254c8..067c9bf4 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -23,6 +23,7 @@ | |||
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 | 25 | ||
26 | #include "gm20b/gr_gm20b.h" | ||
26 | #include "gm20b/ltc_gm20b.h" | 27 | #include "gm20b/ltc_gm20b.h" |
27 | #include "gm20b/fb_gm20b.h" | 28 | #include "gm20b/fb_gm20b.h" |
28 | #include "gm20b/gm20b_gating_reglist.h" | 29 | #include "gm20b/gm20b_gating_reglist.h" |
@@ -81,8 +82,11 @@ struct gpu_ops gp10b_ops = { | |||
81 | } | 82 | } |
82 | }; | 83 | }; |
83 | 84 | ||
84 | int gp10b_init_hal(struct gpu_ops *gops) | 85 | int gp10b_init_hal(struct gk20a *g) |
85 | { | 86 | { |
87 | struct gpu_ops *gops = &g->ops; | ||
88 | struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics; | ||
89 | |||
86 | *gops = gp10b_ops; | 90 | *gops = gp10b_ops; |
87 | gp10b_init_mc(gops); | 91 | gp10b_init_mc(gops); |
88 | gm20b_init_ltc(gops); | 92 | gm20b_init_ltc(gops); |
@@ -96,5 +100,12 @@ int gp10b_init_hal(struct gpu_ops *gops) | |||
96 | gm20b_init_clk_ops(gops); | 100 | gm20b_init_clk_ops(gops); |
97 | gops->name = "gp10b"; | 101 | gops->name = "gp10b"; |
98 | 102 | ||
103 | c->twod_class = FERMI_TWOD_A; | ||
104 | c->threed_class = PASCAL_A; | ||
105 | c->compute_class = PASCAL_COMPUTE_A; | ||
106 | c->gpfifo_class = MAXWELL_CHANNEL_GPFIFO_A; | ||
107 | c->inline_to_memory_class = KEPLER_INLINE_TO_MEMORY_B; | ||
108 | c->dma_copy_class = MAXWELL_DMA_COPY_A; | ||
109 | |||
99 | return 0; | 110 | return 0; |
100 | } | 111 | } |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.h b/drivers/gpu/nvgpu/gp10b/hal_gp10b.h index 78615ed1..0b464d07 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.h | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #ifndef _NVGPU_HAL_GP10B_H | 16 | #ifndef _NVGPU_HAL_GP10B_H |
17 | #define _NVGPU_HAL_GP10B_H | 17 | #define _NVGPU_HAL_GP10B_H |
18 | struct gpu_ops; | 18 | struct gk20a; |
19 | 19 | ||
20 | int gp10b_init_hal(struct gpu_ops *gops); | 20 | int gp10b_init_hal(struct gk20a *gops); |
21 | #endif | 21 | #endif |
diff --git a/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h b/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h index ac65af18..59ecefee 100644 --- a/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h +++ b/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h | |||
@@ -26,6 +26,6 @@ | |||
26 | #define TEGRA_18x_GPU_COMPAT_TEGRA NVGPU_COMPAT_TEGRA_GP10B | 26 | #define TEGRA_18x_GPU_COMPAT_TEGRA NVGPU_COMPAT_TEGRA_GP10B |
27 | #define TEGRA_18x_GPU_COMPAT_GENERIC NVGPU_COMPAT_GENERIC_GP10B | 27 | #define TEGRA_18x_GPU_COMPAT_GENERIC NVGPU_COMPAT_GENERIC_GP10B |
28 | struct gpu_ops; | 28 | struct gpu_ops; |
29 | extern int gp10b_init_hal(struct gpu_ops *); | 29 | extern int gp10b_init_hal(struct gk20a *); |
30 | extern struct gk20a_platform t18x_gpu_tegra_platform; | 30 | extern struct gk20a_platform t18x_gpu_tegra_platform; |
31 | #endif | 31 | #endif |