nvc0: enable compute support by default on Fermi

Compute support was not enabled by default because weird effects
on 3D state happened, but I can't reproduce them anymore.

This also enables MP performance counters by default on Fermi.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Samuel Pitoiset 2015-10-09 16:53:18 +02:00
parent 8cd4b8478a
commit 00d61869a5
2 changed files with 2 additions and 8 deletions

View file

@ -291,7 +291,6 @@ nvc0_screen_get_driver_query_info(struct pipe_screen *pscreen,
count += NVE4_HW_SM_QUERY_COUNT;
} else
if (screen->base.class_3d < NVE4_3D_CLASS) {
/* NVC0_COMPUTE is not always enabled */
count += NVC0_HW_SM_QUERY_COUNT;
}
}
@ -358,7 +357,7 @@ nvc0_screen_get_driver_query_group_info(struct pipe_screen *pscreen,
count++;
} else
if (screen->base.class_3d < NVE4_3D_CLASS) {
count++; /* NVC0_COMPUTE is not always enabled */
count++;
}
}
}

View file

@ -561,12 +561,7 @@ nvc0_screen_init_compute(struct nvc0_screen *screen)
switch (screen->base.device->chipset & ~0xf) {
case 0xc0:
case 0xd0:
/* Using COMPUTE has weird effects on 3D state, we need to
* investigate this further before enabling it by default.
*/
if (debug_get_bool_option("NVC0_COMPUTE", false))
return nvc0_screen_compute_setup(screen, screen->base.pushbuf);
return 0;
return nvc0_screen_compute_setup(screen, screen->base.pushbuf);
case 0xe0:
return nve4_screen_compute_setup(screen, screen->base.pushbuf);
case 0xf0: