]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/nouveau/gr/gf100-: apply be exception fixes from traces
authorBen Skeggs <bskeggs@redhat.com>
Tue, 8 May 2018 10:39:46 +0000 (20:39 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 18 May 2018 05:01:23 +0000 (15:01 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c

index 071b3c1a93ab78f4e0a158294035a1026a99b7ac..452b52798603e3e047c7ec91c333226d3f4ba28a 100644 (file)
@@ -2109,8 +2109,8 @@ gf100_gr_init(struct gf100_gr *gr)
        }
 
        for (rop = 0; rop < gr->rop_nr; rop++) {
-               nvkm_wr32(device, ROP_UNIT(rop, 0x144), 0xc0000000);
-               nvkm_wr32(device, ROP_UNIT(rop, 0x070), 0xc0000000);
+               nvkm_wr32(device, ROP_UNIT(rop, 0x144), 0x40000000);
+               nvkm_wr32(device, ROP_UNIT(rop, 0x070), 0x40000000);
                nvkm_wr32(device, ROP_UNIT(rop, 0x204), 0xffffffff);
                nvkm_wr32(device, ROP_UNIT(rop, 0x208), 0xffffffff);
        }
index 20735319e9205298daa96d639a61a8452ab0c765..1822509fca21dbdd161a2f85a10b9d0d8ad42c54 100644 (file)
@@ -482,8 +482,8 @@ gk104_gr_init(struct gf100_gr *gr)
        }
 
        for (rop = 0; rop < gr->rop_nr; rop++) {
-               nvkm_wr32(device, ROP_UNIT(rop, 0x144), 0xc0000000);
-               nvkm_wr32(device, ROP_UNIT(rop, 0x070), 0xc0000000);
+               nvkm_wr32(device, ROP_UNIT(rop, 0x144), 0x40000000);
+               nvkm_wr32(device, ROP_UNIT(rop, 0x070), 0x40000000);
                nvkm_wr32(device, ROP_UNIT(rop, 0x204), 0xffffffff);
                nvkm_wr32(device, ROP_UNIT(rop, 0x208), 0xffffffff);
        }