leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/gr/gf100-: update 419a3c where required

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2018-05-08 20:39:47 +10:00
parent c2592adea7
commit 8d56fc48d3
6 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
View File

@ -1434,6 +1434,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
grctx->r419e00(gr); grctx->r419e00(gr);
if (grctx->r418e94) if (grctx->r418e94)
grctx->r418e94(gr); grctx->r418e94(gr);
if (grctx->r419a3c)
grctx->r419a3c(gr);
} }
#define CB_RESERVED 0x80000 #define CB_RESERVED 0x80000

2
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
View File

@ -69,6 +69,7 @@ struct gf100_grctx_func {
void (*r419eb0)(struct gf100_gr *); void (*r419eb0)(struct gf100_gr *);
void (*r419e00)(struct gf100_gr *); void (*r419e00)(struct gf100_gr *);
void (*r418e94)(struct gf100_gr *); void (*r418e94)(struct gf100_gr *);
void (*r419a3c)(struct gf100_gr *);
}; };
extern const struct gf100_grctx_func gf100_grctx; extern const struct gf100_grctx_func gf100_grctx;
@ -130,6 +131,7 @@ void gm200_grctx_generate_dist_skip_table(struct gf100_gr *);
void gm200_grctx_generate_r406500(struct gf100_gr *); void gm200_grctx_generate_r406500(struct gf100_gr *);
void gm200_grctx_generate_tpc_mask(struct gf100_gr *); void gm200_grctx_generate_tpc_mask(struct gf100_gr *);
void gm200_grctx_generate_smid_config(struct gf100_gr *); void gm200_grctx_generate_smid_config(struct gf100_gr *);
void gm200_grctx_generate_r419a3c(struct gf100_gr *);
extern const struct gf100_grctx_func gm20b_grctx; extern const struct gf100_grctx_func gm20b_grctx;

8
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
View File

@ -27,6 +27,13 @@
* PGRAPH context implementation * PGRAPH context implementation
******************************************************************************/ ******************************************************************************/
void
gm200_grctx_generate_r419a3c(struct gf100_gr *gr)
{
struct nvkm_device *device = gr->base.engine.subdev.device;
nvkm_mask(device, 0x419a3c, 0x00000014, 0x00000000);
}
static void static void
gm200_grctx_generate_r418e94(struct gf100_gr *gr) gm200_grctx_generate_r418e94(struct gf100_gr *gr)
{ {
@ -152,4 +159,5 @@ gm200_grctx = {
.tpc_mask = gm200_grctx_generate_tpc_mask, .tpc_mask = gm200_grctx_generate_tpc_mask,
.smid_config = gm200_grctx_generate_smid_config, .smid_config = gm200_grctx_generate_smid_config,
.r418e94 = gm200_grctx_generate_r418e94, .r418e94 = gm200_grctx_generate_r418e94,
.r419a3c = gm200_grctx_generate_r419a3c,
}; };

1
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
View File

@ -165,4 +165,5 @@ gp100_grctx = {
.gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr, .gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
.tpc_mask = gm200_grctx_generate_tpc_mask, .tpc_mask = gm200_grctx_generate_tpc_mask,
.smid_config = gp100_grctx_generate_smid_config, .smid_config = gp100_grctx_generate_smid_config,
.r419a3c = gm200_grctx_generate_r419a3c,
}; };

1
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
View File

@ -101,4 +101,5 @@ gp102_grctx = {
.gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr, .gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
.tpc_mask = gm200_grctx_generate_tpc_mask, .tpc_mask = gm200_grctx_generate_tpc_mask,
.smid_config = gp100_grctx_generate_smid_config, .smid_config = gp100_grctx_generate_smid_config,
.r419a3c = gm200_grctx_generate_r419a3c,
}; };

1
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
View File

@ -51,4 +51,5 @@ gp107_grctx = {
.gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr, .gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
.tpc_mask = gm200_grctx_generate_tpc_mask, .tpc_mask = gm200_grctx_generate_tpc_mask,
.smid_config = gp100_grctx_generate_smid_config, .smid_config = gp100_grctx_generate_smid_config,
.r419a3c = gm200_grctx_generate_r419a3c,
}; };