diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index bb54e00e..fbba02ca 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -59,7 +59,6 @@ | |||
59 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> | 59 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> |
60 | #include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h> | 60 | #include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h> |
61 | #include <nvgpu/hw/gk20a/hw_top_gk20a.h> | 61 | #include <nvgpu/hw/gk20a/hw_top_gk20a.h> |
62 | #include <nvgpu/hw/gk20a/hw_ltc_gk20a.h> | ||
63 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> | 62 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> |
64 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> | 63 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
65 | 64 | ||
@@ -6256,11 +6255,11 @@ int gr_gk20a_decode_priv_addr(struct gk20a *g, u32 addr, | |||
6256 | } | 6255 | } |
6257 | *be_num = pri_get_be_num(g, addr); | 6256 | *be_num = pri_get_be_num(g, addr); |
6258 | return 0; | 6257 | return 0; |
6259 | } else if (pri_is_ltc_addr(addr)) { | 6258 | } else if (g->ops.ltc.pri_is_ltc_addr(g, addr)) { |
6260 | *addr_type = CTXSW_ADDR_TYPE_LTCS; | 6259 | *addr_type = CTXSW_ADDR_TYPE_LTCS; |
6261 | if (g->ops.gr.is_ltcs_ltss_addr(g, addr)) | 6260 | if (g->ops.ltc.is_ltcs_ltss_addr(g, addr)) |
6262 | *broadcast_flags |= PRI_BROADCAST_FLAGS_LTCS; | 6261 | *broadcast_flags |= PRI_BROADCAST_FLAGS_LTCS; |
6263 | else if (g->ops.gr.is_ltcn_ltss_addr(g, addr)) | 6262 | else if (g->ops.ltc.is_ltcn_ltss_addr(g, addr)) |
6264 | *broadcast_flags |= PRI_BROADCAST_FLAGS_LTSS; | 6263 | *broadcast_flags |= PRI_BROADCAST_FLAGS_LTSS; |
6265 | return 0; | 6264 | return 0; |
6266 | } else if (pri_is_fbpa_addr(g, addr)) { | 6265 | } else if (pri_is_fbpa_addr(g, addr)) { |
@@ -6398,10 +6397,10 @@ int gr_gk20a_create_priv_addr_table(struct gk20a *g, | |||
6398 | g->ops.gr.egpc_etpc_priv_addr_table(g, addr, gpc_num, tpc_num, | 6397 | g->ops.gr.egpc_etpc_priv_addr_table(g, addr, gpc_num, tpc_num, |
6399 | broadcast_flags, priv_addr_table, &t); | 6398 | broadcast_flags, priv_addr_table, &t); |
6400 | } else if (broadcast_flags & PRI_BROADCAST_FLAGS_LTSS) { | 6399 | } else if (broadcast_flags & PRI_BROADCAST_FLAGS_LTSS) { |
6401 | g->ops.gr.split_lts_broadcast_addr(g, addr, | 6400 | g->ops.ltc.split_lts_broadcast_addr(g, addr, |
6402 | priv_addr_table, &t); | 6401 | priv_addr_table, &t); |
6403 | } else if (broadcast_flags & PRI_BROADCAST_FLAGS_LTCS) { | 6402 | } else if (broadcast_flags & PRI_BROADCAST_FLAGS_LTCS) { |
6404 | g->ops.gr.split_ltc_broadcast_addr(g, addr, | 6403 | g->ops.ltc.split_ltc_broadcast_addr(g, addr, |
6405 | priv_addr_table, &t); | 6404 | priv_addr_table, &t); |
6406 | } else if (broadcast_flags & PRI_BROADCAST_FLAGS_FBPA) { | 6405 | } else if (broadcast_flags & PRI_BROADCAST_FLAGS_FBPA) { |
6407 | g->ops.gr.split_fbpa_broadcast_addr(g, addr, | 6406 | g->ops.gr.split_fbpa_broadcast_addr(g, addr, |