]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/nouveau/gr/gf100: select a stream master to fixup tfb offset queries
authorBen Skeggs <bskeggs@redhat.com>
Fri, 22 Apr 2016 00:05:21 +0000 (10:05 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 May 2016 21:49:05 +0000 (14:49 -0700)
commit 28dca90533750c7e31e8641c3df426bad9c12941 upstream.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c

index 1f81069edc58d6d12c71031faa67c13c732a570a..332b5fe687fe24993fe5fac2978099e00ae01263 100644 (file)
@@ -1807,6 +1807,8 @@ gf100_gr_init(struct gf100_gr *gr)
 
        gf100_gr_mmio(gr, gr->func->mmio);
 
+       nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001);
+
        memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
        for (i = 0, gpc = -1; i < gr->tpc_total; i++) {
                do {