diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2022-06-01 20:48:19 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2022-11-09 10:45:13 +1000 |
| commit | 75e637db601acbd2b59ca9f97474203635da5b52 (patch) | |
| tree | 5413d6d60d372b78bb774ec468fd228fec534d96 /drivers/gpu/drm | |
| parent | 81d4201e7ffc0d86e3cf3659f8341545d410b023 (diff) | |
| download | linux-75e637db601acbd2b59ca9f97474203635da5b52.tar.bz2 | |
drm/nouveau/gr/gv100-: move init_419bd8() after sw_ctx load
Match RM.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c index a56f4f3f6c1e..7c318cdcb428 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c @@ -1359,6 +1359,9 @@ gf100_grctx_generate_main(struct gf100_gr_chan *chan) gf100_gr_mmio(gr, gr->sw_ctx); } + if (gr->func->init_419bd8) + gr->func->init_419bd8(gr); + gf100_gr_wait_idle(gr); idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000); diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c index 5ce83b915ebb..ddf06f5e7535 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c @@ -2333,9 +2333,6 @@ gf100_gr_init(struct gf100_gr *gr) nvkm_mask(device, 0x400500, 0x00010001, 0x00000000); - if (gr->func->init_419bd8) - gr->func->init_419bd8(gr); - gr->func->init_gpc_mmu(gr); if (gr->sw_nonctx) |