summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-04-22 10:09:33 +1000
committerDave Airlie <airlied@redhat.com>2016-04-22 10:09:33 +1000
commit005e8dad01d2a7b98948927d7e0c4c7c61ec2d69 (patch)
tree3cd1caf04ce0cec1ae6cc215791de2cabe83528f
parentdeba0a2af9592b2022a0bce7b085a318b53ce1db (diff)
parent28dca90533750c7e31e8641c3df426bad9c12941 (diff)
downloadlinux-sh-005e8dad01d2a7b98948927d7e0c4c7c61ec2d69.tar.gz
Merge branch 'linux-4.6' of git://github.com/skeggsb/linux into drm-fixes
transform feedback fix. * 'linux-4.6' of git://github.com/skeggsb/linux: drm/nouveau/gr/gf100: select a stream master to fixup tfb offset queries
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index c56a886229f1..b2de290da16f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -1832,6 +1832,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 {