diff options
| author | Samuel Pitoiset <[email protected]> | 2014-07-04 16:34:59 +0200 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2014-07-08 19:41:00 -0400 |
| commit | 50bbe49c330095ba451d0f48c56759d148a609c2 (patch) | |
| tree | c0b54955a44a91090ae47532bbe044583ac6c5c3 /src/gallium/drivers/nouveau | |
| parent | a9b21015f5e3a6a37e53a8b3c755519f7b70479e (diff) | |
nvc0: allocate more space before a counter is configured
On nvc0, a counter can have up to 6 sources instead of only one
for nve4+. This fixes a crash when a counter uses more than
one source.
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau')
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_query.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c index 70fe270c27b..50cef1e96c4 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c @@ -1067,6 +1067,7 @@ nvc0_mp_pm_query_begin(struct nvc0_context *nvc0, struct nvc0_query *q) { struct nvc0_screen *screen = nvc0->screen; struct nouveau_pushbuf *push = nvc0->base.pushbuf; + const boolean is_nve4 = screen->base.class_3d >= NVE4_3D_CLASS; const struct nvc0_mp_pm_query_cfg *cfg; unsigned i, c; unsigned num_ab[2] = { 0, 0 }; @@ -1084,7 +1085,7 @@ nvc0_mp_pm_query_begin(struct nvc0_context *nvc0, struct nvc0_query *q) } assert(cfg->num_counters <= 4); - PUSH_SPACE(push, 4 * 8 + 6); + PUSH_SPACE(push, 4 * 8 * (is_nve4 ? 1 : 6) + 6); if (!screen->pm.mp_counters_enabled) { screen->pm.mp_counters_enabled = TRUE; @@ -1118,7 +1119,7 @@ nvc0_mp_pm_query_begin(struct nvc0_context *nvc0, struct nvc0_query *q) assert(c <= (d * 4 + 3)); /* must succeed, already checked for space */ /* configure and reset the counter(s) */ - if (screen->base.class_3d >= NVE4_3D_CLASS) { + if (is_nve4) { if (d == 0) BEGIN_NVC0(push, NVE4_COMPUTE(MP_PM_A_SIGSEL(c & 3)), 1); else |