Mesa (master): nvc0: correctly enable the MP counters' multiplexer on Fermi

[Samuel Pitoiset]

Module: Mesa
Branch: master
Commit: 409658c367c50bfb2fae6dec7d5b0ab5db16fe57
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=409658c367c50bfb2fae6dec7d5b0ab5db16fe57

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Oct  9 10:55:25 2015 +0200

nvc0: correctly enable the MP counters' multiplexer on Fermi

Writing 0x408000 to 0x419e00 (like on Kepler) has no effect on Fermi
because we only have one domain of 8 counters. Instead, we have to
write 0x80000000.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
index a74bfee..f7b49da 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
@@ -448,11 +448,8 @@ nvc0_hw_sm_begin_query(struct nvc0_context *nvc0, struct nvc0_hw_query *hq)
       unsigned s;
 
       if (!screen->pm.num_hw_sm_active[d]) {
-         uint32_t m = (1 << 22) | (1 << (7 + (8 * !d)));
-         if (screen->pm.num_hw_sm_active[!d])
-            m |= 1 << (7 + (8 * d));
          BEGIN_NVC0(push, SUBC_SW(0x0600), 1);
-         PUSH_DATA (push, m);
+         PUSH_DATA (push, 0x80000000);
       }
       screen->pm.num_hw_sm_active[d]++;