From: Samuel Pitoiset Date: Fri, 9 Oct 2015 08:55:25 +0000 (+0200) Subject: nvc0: correctly enable the MP counters' multiplexer on Fermi X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=409658c367c50bfb2fae6dec7d5b0ab5db16fe57;p=mesa.git 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 Reviewed-by: Ilia Mirkin --- 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 a74bfee60e6..f7b49da8d43 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]++;