summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2015-10-09 10:55:25 +0200
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2015-10-16 21:57:44 +0200
commit409658c367c50bfb2fae6dec7d5b0ab5db16fe57 (patch)
treecff5422704b9693e6fa71a4744fca6777d6b293d
parentc3570c3fb9ee78ab7af2de781a7056b3642bebb9 (diff)
downloadexternal_mesa3d-409658c367c50bfb2fae6dec7d5b0ab5db16fe57.zip
external_mesa3d-409658c367c50bfb2fae6dec7d5b0ab5db16fe57.tar.gz
external_mesa3d-409658c367c50bfb2fae6dec7d5b0ab5db16fe57.tar.bz2
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@gmail.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
-rw-r--r--src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c5
1 files changed, 1 insertions, 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]++;