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

drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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 {