diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 7cb8462f..e69036d7 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -35,7 +35,6 @@ struct gk20a_ctxsw_trace; | |||
35 | struct acr_desc; | 35 | struct acr_desc; |
36 | struct nvgpu_mem_alloc_tracker; | 36 | struct nvgpu_mem_alloc_tracker; |
37 | struct dbg_profiler_object_data; | 37 | struct dbg_profiler_object_data; |
38 | struct ecc_gk20a; | ||
39 | struct gk20a_debug_output; | 38 | struct gk20a_debug_output; |
40 | struct nvgpu_clk_pll_debug_data; | 39 | struct nvgpu_clk_pll_debug_data; |
41 | struct nvgpu_nvhost_dev; | 40 | struct nvgpu_nvhost_dev; |
@@ -64,6 +63,7 @@ struct nvgpu_ctxsw_trace_filter; | |||
64 | #include <nvgpu/clk_arb.h> | 63 | #include <nvgpu/clk_arb.h> |
65 | #include <nvgpu/nvlink.h> | 64 | #include <nvgpu/nvlink.h> |
66 | #include <nvgpu/sim.h> | 65 | #include <nvgpu/sim.h> |
66 | #include <nvgpu/ecc.h> | ||
67 | 67 | ||
68 | #include "clk_gk20a.h" | 68 | #include "clk_gk20a.h" |
69 | #include "ce2_gk20a.h" | 69 | #include "ce2_gk20a.h" |
@@ -77,7 +77,6 @@ struct nvgpu_ctxsw_trace_filter; | |||
77 | #include "perf/perf.h" | 77 | #include "perf/perf.h" |
78 | #include "pmgr/pmgr.h" | 78 | #include "pmgr/pmgr.h" |
79 | #include "therm/thrm.h" | 79 | #include "therm/thrm.h" |
80 | #include "ecc_gk20a.h" | ||
81 | 80 | ||
82 | /* PTIMER_REF_FREQ_HZ corresponds to a period of 32 nanoseconds. | 81 | /* PTIMER_REF_FREQ_HZ corresponds to a period of 32 nanoseconds. |
83 | 32 ns is the resolution of ptimer. */ | 82 | 32 ns is the resolution of ptimer. */ |
@@ -384,8 +383,7 @@ struct gpu_ops { | |||
384 | u32 gpc_exception); | 383 | u32 gpc_exception); |
385 | void (*enable_gpc_exceptions)(struct gk20a *g); | 384 | void (*enable_gpc_exceptions)(struct gk20a *g); |
386 | void (*enable_exceptions)(struct gk20a *g); | 385 | void (*enable_exceptions)(struct gk20a *g); |
387 | void (*create_gr_sysfs)(struct gk20a *g); | 386 | int (*init_ecc)(struct gk20a *g); |
388 | void (*remove_gr_sysfs)(struct gk20a *g); | ||
389 | u32 (*get_lrf_tex_ltc_dram_override)(struct gk20a *g); | 387 | u32 (*get_lrf_tex_ltc_dram_override)(struct gk20a *g); |
390 | int (*record_sm_error_state)(struct gk20a *g, u32 gpc, u32 tpc, | 388 | int (*record_sm_error_state)(struct gk20a *g, u32 gpc, u32 tpc, |
391 | u32 sm, struct channel_gk20a *fault_ch); | 389 | u32 sm, struct channel_gk20a *fault_ch); |
@@ -1385,7 +1383,7 @@ struct gk20a { | |||
1385 | struct mm_gk20a mm; | 1383 | struct mm_gk20a mm; |
1386 | struct nvgpu_pmu pmu; | 1384 | struct nvgpu_pmu pmu; |
1387 | struct acr_desc acr; | 1385 | struct acr_desc acr; |
1388 | struct ecc_gk20a ecc; | 1386 | struct nvgpu_ecc ecc; |
1389 | struct clk_pmupstate clk_pmu; | 1387 | struct clk_pmupstate clk_pmu; |
1390 | struct perf_pmupstate perf_pmu; | 1388 | struct perf_pmupstate perf_pmu; |
1391 | struct pmgr_pmupstate pmgr_pmu; | 1389 | struct pmgr_pmupstate pmgr_pmu; |