diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2018-05-08 20:39:46 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2018-05-18 15:01:22 +1000 |
| commit | 3ac72e98b40ead6225eb38bcf78ec540357106c0 (patch) | |
| tree | bd4f9f9e7e1e52226cd0985832c1ffe448bcf502 /drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c | |
| parent | 2585a1b1312e96c6a28f3008029408b5feca3ff4 (diff) | |
| download | op-kernel-dev-3ac72e98b40ead6225eb38bcf78ec540357106c0.zip op-kernel-dev-3ac72e98b40ead6225eb38bcf78ec540357106c0.tar.gz | |
drm/nouveau/gr/gf100-: virtualise init_ds_hww_esr_2
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c index 564b5b1..676f58a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c @@ -70,8 +70,7 @@ gp100_gr_init(struct gf100_gr *gr) nvkm_wr32(device, 0x40013c, 0xffffffff); nvkm_wr32(device, 0x400124, 0x00000002); gr->func->init_fecs_exceptions(gr); - nvkm_wr32(device, 0x405848, 0xc0000000); - nvkm_mask(device, 0x40584c, 0x00000000, 0x00000001); + gr->func->init_ds_hww_esr_2(gr); nvkm_wr32(device, 0x404000, 0xc0000000); nvkm_wr32(device, 0x404600, 0xc0000000); nvkm_wr32(device, 0x408030, 0xc0000000); @@ -134,6 +133,7 @@ gp100_gr = { .init_num_active_ltcs = gm200_gr_init_num_active_ltcs, .init_rop_active_fbps = gp100_gr_init_rop_active_fbps, .init_fecs_exceptions = gp100_gr_init_fecs_exceptions, + .init_ds_hww_esr_2 = gm200_gr_init_ds_hww_esr_2, .init_ppc_exceptions = gk104_gr_init_ppc_exceptions, .rops = gm200_gr_rops, .ppc_nr = 2, |
