Skip to content

Commit afa3b96

Browse files
author
Ben Skeggs
committed
drm/nouveau/gr/tu10x: initial support
Signed-off-by: Ben Skeggs <[email protected]>
1 parent 3fa8fe1 commit afa3b96

File tree

12 files changed

+313
-11
lines changed

12 files changed

+313
-11
lines changed

‎drivers/gpu/drm/nouveau/include/nvif/class.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@
166166

167167
#define VOLTA_A /* cl9097.h */ 0x0000c397
168168

169+
#define TURING_A /* cl9097.h */ 0x0000c597
170+
169171
#define NV74_BSP 0x000074b0
170172

171173
#define GT212_MSVLD 0x000085b1
@@ -207,6 +209,7 @@
207209
#define PASCAL_COMPUTE_A 0x0000c0c0
208210
#define PASCAL_COMPUTE_B 0x0000c1c0
209211
#define VOLTA_COMPUTE_A 0x0000c3c0
212+
#define TURING_COMPUTE_A 0x0000c5c0
210213

211214
#define NV74_CIPHER 0x000074c1
212215
#endif

‎drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,5 @@ int gp107_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
5353
int gp108_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
5454
int gp10b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
5555
int gv100_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
56+
int tu102_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
5657
#endif

‎drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2491,6 +2491,7 @@ nv162_chipset = {
24912491
.disp = tu102_disp_new,
24922492
.dma = gv100_dma_new,
24932493
.fifo = tu102_fifo_new,
2494+
.gr = tu102_gr_new,
24942495
.nvdec[0] = gm107_nvdec_new,
24952496
.nvenc[0] = gm107_nvenc_new,
24962497
.sec2 = tu102_sec2_new,
@@ -2528,6 +2529,7 @@ nv164_chipset = {
25282529
.disp = tu102_disp_new,
25292530
.dma = gv100_dma_new,
25302531
.fifo = tu102_fifo_new,
2532+
.gr = tu102_gr_new,
25312533
.nvdec[0] = gm107_nvdec_new,
25322534
.nvdec[1] = gm107_nvdec_new,
25332535
.nvenc[0] = gm107_nvenc_new,
@@ -2566,6 +2568,7 @@ nv166_chipset = {
25662568
.disp = tu102_disp_new,
25672569
.dma = gv100_dma_new,
25682570
.fifo = tu102_fifo_new,
2571+
.gr = tu102_gr_new,
25692572
.nvdec[0] = gm107_nvdec_new,
25702573
.nvdec[1] = gm107_nvdec_new,
25712574
.nvdec[2] = gm107_nvdec_new,

‎drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ nvkm-y += nvkm/engine/gr/gp107.o
3939
nvkm-y += nvkm/engine/gr/gp108.o
4040
nvkm-y += nvkm/engine/gr/gp10b.o
4141
nvkm-y += nvkm/engine/gr/gv100.o
42+
nvkm-y += nvkm/engine/gr/tu102.o
4243

4344
nvkm-y += nvkm/engine/gr/ctxnv40.o
4445
nvkm-y += nvkm/engine/gr/ctxnv50.o
@@ -61,3 +62,4 @@ nvkm-y += nvkm/engine/gr/ctxgp102.o
6162
nvkm-y += nvkm/engine/gr/ctxgp104.o
6263
nvkm-y += nvkm/engine/gr/ctxgp107.o
6364
nvkm-y += nvkm/engine/gr/ctxgv100.o
65+
nvkm-y += nvkm/engine/gr/ctxtu102.o

‎drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,8 @@ gf100_grctx_generate_floorsweep(struct gf100_gr *gr)
13341334
}
13351335

13361336
gf100_gr_init_num_tpc_per_gpc(gr, false, true);
1337-
gf100_gr_init_num_tpc_per_gpc(gr, true, false);
1337+
if (!func->skip_pd_num_tpc_per_gpc)
1338+
gf100_gr_init_num_tpc_per_gpc(gr, true, false);
13381339

13391340
if (func->r4060a8)
13401341
func->r4060a8(gr);
@@ -1425,6 +1426,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
14251426
grctx->r419a3c(gr);
14261427
if (grctx->r408840)
14271428
grctx->r408840(gr);
1429+
if (grctx->r419c0c)
1430+
grctx->r419c0c(gr);
14281431
}
14291432

14301433
#define CB_RESERVED 0x80000

‎drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ struct gf100_grctx_func {
5757
/* floorsweeping */
5858
void (*sm_id)(struct gf100_gr *, int gpc, int tpc, int sm);
5959
void (*tpc_nr)(struct gf100_gr *, int gpc);
60+
bool skip_pd_num_tpc_per_gpc;
6061
void (*r4060a8)(struct gf100_gr *);
6162
void (*rop_mapping)(struct gf100_gr *);
6263
void (*alpha_beta_tables)(struct gf100_gr *);
@@ -76,6 +77,7 @@ struct gf100_grctx_func {
7677
void (*r418e94)(struct gf100_gr *);
7778
void (*r419a3c)(struct gf100_gr *);
7879
void (*r408840)(struct gf100_gr *);
80+
void (*r419c0c)(struct gf100_gr *);
7981
};
8082

8183
extern const struct gf100_grctx_func gf100_grctx;
@@ -153,6 +155,14 @@ extern const struct gf100_grctx_func gp107_grctx;
153155

154156
extern const struct gf100_grctx_func gv100_grctx;
155157

158+
extern const struct gf100_grctx_func tu102_grctx;
159+
void gv100_grctx_unkn88c(struct gf100_gr *, bool);
160+
void gv100_grctx_generate_unkn(struct gf100_gr *);
161+
extern const struct gf100_gr_init gv100_grctx_init_sw_veid_bundle_init_0[];
162+
void gv100_grctx_generate_attrib(struct gf100_grctx *);
163+
void gv100_grctx_generate_rop_mapping(struct gf100_gr *);
164+
void gv100_grctx_generate_r400088(struct gf100_gr *, bool);
165+
156166
/* context init value lists */
157167

158168
extern const struct gf100_gr_pack gf100_grctx_pack_icmd[];

‎drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgv100.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* PGRAPH context implementation
2626
******************************************************************************/
2727

28-
static const struct gf100_gr_init
28+
const struct gf100_gr_init
2929
gv100_grctx_init_sw_veid_bundle_init_0[] = {
3030
{ 0x00001000, 64, 0x00100000, 0x00000008 },
3131
{ 0x00000941, 64, 0x00100000, 0x00000000 },
@@ -58,7 +58,7 @@ gv100_grctx_pack_sw_veid_bundle_init[] = {
5858
{}
5959
};
6060

61-
static void
61+
void
6262
gv100_grctx_generate_attrib(struct gf100_grctx *info)
6363
{
6464
struct gf100_gr *gr = info->gr;
@@ -109,7 +109,7 @@ gv100_grctx_generate_attrib(struct gf100_grctx *info)
109109
mmio_wr32(info, 0x41befc, 0x00000100);
110110
}
111111

112-
static void
112+
void
113113
gv100_grctx_generate_rop_mapping(struct gf100_gr *gr)
114114
{
115115
struct nvkm_device *device = gr->base.engine.subdev.device;
@@ -146,7 +146,7 @@ gv100_grctx_generate_rop_mapping(struct gf100_gr *gr)
146146
gr->screen_tile_row_offset);
147147
}
148148

149-
static void
149+
void
150150
gv100_grctx_generate_r400088(struct gf100_gr *gr, bool on)
151151
{
152152
struct nvkm_device *device = gr->base.engine.subdev.device;
@@ -162,7 +162,7 @@ gv100_grctx_generate_sm_id(struct gf100_gr *gr, int gpc, int tpc, int sm)
162162
nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x088), sm);
163163
}
164164

165-
static void
165+
void
166166
gv100_grctx_generate_unkn(struct gf100_gr *gr)
167167
{
168168
struct nvkm_device *device = gr->base.engine.subdev.device;
@@ -173,7 +173,7 @@ gv100_grctx_generate_unkn(struct gf100_gr *gr)
173173
nvkm_mask(device, 0x419c00, 0x00000008, 0x00000008);
174174
}
175175

176-
static void
176+
void
177177
gv100_grctx_unkn88c(struct gf100_gr *gr, bool on)
178178
{
179179
struct nvkm_device *device = gr->base.engine.subdev.device;

‎drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxtu102.c

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
/*
2+
* Copyright 2019 Red Hat Inc.
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a
5+
* copy of this software and associated documentation files (the "Software"),
6+
* to deal in the Software without restriction, including without limitation
7+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
* and/or sell copies of the Software, and to permit persons to whom the
9+
* Software is furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18+
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19+
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20+
* OTHER DEALINGS IN THE SOFTWARE.
21+
*/
22+
#include "ctxgf100.h"
23+
24+
static void
25+
tu102_grctx_generate_r419c0c(struct gf100_gr *gr)
26+
{
27+
struct nvkm_device *device = gr->base.engine.subdev.device;
28+
nvkm_mask(device, 0x419c0c, 0x80000000, 0x80000000);
29+
nvkm_mask(device, 0x40584c, 0x00000008, 0x00000000);
30+
nvkm_mask(device, 0x400080, 0x00000000, 0x00000000);
31+
}
32+
33+
static void
34+
tu102_grctx_generate_sm_id(struct gf100_gr *gr, int gpc, int tpc, int sm)
35+
{
36+
struct nvkm_device *device = gr->base.engine.subdev.device;
37+
nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x608), sm);
38+
nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x088), sm);
39+
}
40+
41+
static const struct gf100_gr_init
42+
tu102_grctx_init_unknown_bundle_init_0[] = {
43+
{ 0x00001000, 1, 0x00000001, 0x00000004 },
44+
{ 0x00002020, 64, 0x00000001, 0x00000000 },
45+
{ 0x0001e100, 1, 0x00000001, 0x00000001 },
46+
{}
47+
};
48+
49+
static const struct gf100_gr_pack
50+
tu102_grctx_pack_sw_veid_bundle_init[] = {
51+
{ gv100_grctx_init_sw_veid_bundle_init_0 },
52+
{ tu102_grctx_init_unknown_bundle_init_0 },
53+
{}
54+
};
55+
56+
static void
57+
tu102_grctx_generate_attrib(struct gf100_grctx *info)
58+
{
59+
const u64 size = 0x80000; /*XXX: educated guess */
60+
const int s = 8;
61+
const int b = mmio_vram(info, size, (1 << s), true);
62+
63+
gv100_grctx_generate_attrib(info);
64+
65+
mmio_refn(info, 0x408070, 0x00000000, s, b);
66+
mmio_wr32(info, 0x408074, size >> s); /*XXX: guess */
67+
mmio_refn(info, 0x419034, 0x00000000, s, b);
68+
mmio_wr32(info, 0x408078, 0x00000000);
69+
}
70+
71+
const struct gf100_grctx_func
72+
tu102_grctx = {
73+
.unkn88c = gv100_grctx_unkn88c,
74+
.main = gf100_grctx_generate_main,
75+
.unkn = gv100_grctx_generate_unkn,
76+
.sw_veid_bundle_init = tu102_grctx_pack_sw_veid_bundle_init,
77+
.bundle = gm107_grctx_generate_bundle,
78+
.bundle_size = 0x3000,
79+
.bundle_min_gpm_fifo_depth = 0x180,
80+
.bundle_token_limit = 0xa80,
81+
.pagepool = gp100_grctx_generate_pagepool,
82+
.pagepool_size = 0x20000,
83+
.attrib = tu102_grctx_generate_attrib,
84+
.attrib_nr_max = 0x800,
85+
.attrib_nr = 0x700,
86+
.alpha_nr_max = 0xc00,
87+
.alpha_nr = 0x800,
88+
.gfxp_nr = 0xfa8,
89+
.sm_id = tu102_grctx_generate_sm_id,
90+
.skip_pd_num_tpc_per_gpc = true,
91+
.rop_mapping = gv100_grctx_generate_rop_mapping,
92+
.r406500 = gm200_grctx_generate_r406500,
93+
.r400088 = gv100_grctx_generate_r400088,
94+
.r419c0c = tu102_grctx_generate_r419c0c,
95+
};

‎drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2262,6 +2262,8 @@ gf100_gr_init(struct gf100_gr *gr)
22622262
gr->func->init_bios_2(gr);
22632263
if (gr->func->init_swdx_pes_mask)
22642264
gr->func->init_swdx_pes_mask(gr);
2265+
if (gr->func->init_fs)
2266+
gr->func->init_fs(gr);
22652267

22662268
nvkm_wr32(device, 0x400500, 0x00010001);
22672269

‎drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ struct gf100_gr_func {
162162
void (*init_rop_active_fbps)(struct gf100_gr *);
163163
void (*init_bios_2)(struct gf100_gr *);
164164
void (*init_swdx_pes_mask)(struct gf100_gr *);
165+
void (*init_fs)(struct gf100_gr *);
165166
void (*init_fecs_exceptions)(struct gf100_gr *);
166167
void (*init_ds_hww_esr_2)(struct gf100_gr *);
167168
void (*init_40601c)(struct gf100_gr *);
@@ -243,6 +244,11 @@ extern const struct gf100_gr_func_zbc gp102_gr_zbc;
243244

244245
extern const struct gf100_gr_func gp107_gr;
245246

247+
void gv100_gr_init_419bd8(struct gf100_gr *);
248+
void gv100_gr_init_504430(struct gf100_gr *, int, int);
249+
void gv100_gr_init_shader_exceptions(struct gf100_gr *, int, int);
250+
void gv100_gr_trap_mp(struct gf100_gr *, int, int);
251+
246252
#define gf100_gr_chan(p) container_of((p), struct gf100_gr_chan, object)
247253
#include <core/object.h>
248254

0 commit comments

Comments
 (0)