openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/gr/gf100-: add missing reset sequence before golden context init 

RM and NVGPU both have a variant of this, we probably should too.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2018-05-08 20:39:47 +10:00
parent 201ed6f651
commit 74b6068bd6
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1456,6 +1456,26 @@ gf100_grctx_generate(struct gf100_gr *gr)
int ret, i;
u64 addr;
/* NV_PGRAPH_FE_PWR_MODE_FORCE_ON. */
nvkm_wr32(device, 0x404170, 0x00000012);
nvkm_msec(device, 2000,
if (!(nvkm_rd32(device, 0x404170) & 0x00000010))
break;
);
/* Reset FECS. */
nvkm_wr32(device, 0x409614, 0x00000070);
nvkm_usec(device, 10, NVKM_DELAY);
nvkm_mask(device, 0x409614, 0x00000700, 0x00000700);
nvkm_usec(device, 10, NVKM_DELAY);
nvkm_rd32(device, 0x409614);
/* NV_PGRAPH_FE_PWR_MODE_AUTO. */
nvkm_wr32(device, 0x404170, 0x00000010);
/* Init SCC RAM. */
nvkm_wr32(device, 0x40802c, 0x00000001);
/* Allocate memory to for a "channel", which we'll use to generate
* the default context values.
*/