mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-29 03:31:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/gr/gv100-: move init_419bd8() after sw_ctx load

Browse Source 
Match RM.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
This commit is contained in:
Ben Skeggs
2022-06-01 20:48:19 +10:00
parent 81d4201e7f
commit 75e637db60
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

3
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
View File

@@ -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)