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:
@@ -291,7 +291,6 @@ nvc0_screen_get_driver_query_info(struct pipe_screen *pscreen,
|
|||||||
count += NVE4_HW_SM_QUERY_COUNT;
|
count += NVE4_HW_SM_QUERY_COUNT;
|
||||||
} else
|
} else
|
||||||
if (screen->base.class_3d < NVE4_3D_CLASS) {
|
if (screen->base.class_3d < NVE4_3D_CLASS) {
|
||||||
/* NVC0_COMPUTE is not always enabled */
|
|
||||||
count += NVC0_HW_SM_QUERY_COUNT;
|
count += NVC0_HW_SM_QUERY_COUNT;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -358,7 +357,7 @@ nvc0_screen_get_driver_query_group_info(struct pipe_screen *pscreen,
|
|||||||
count++;
|
count++;
|
||||||
} else
|
} else
|
||||||
if (screen->base.class_3d < NVE4_3D_CLASS) {
|
if (screen->base.class_3d < NVE4_3D_CLASS) {
|
||||||
count++; /* NVC0_COMPUTE is not always enabled */
|
count++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -561,12 +561,7 @@ nvc0_screen_init_compute(struct nvc0_screen *screen)
|
|||||||
switch (screen->base.device->chipset & ~0xf) {
|
switch (screen->base.device->chipset & ~0xf) {
|
||||||
case 0xc0:
|
case 0xc0:
|
||||||
case 0xd0:
|
case 0xd0:
|
||||||
/* Using COMPUTE has weird effects on 3D state, we need to
|
return nvc0_screen_compute_setup(screen, screen->base.pushbuf);
|
||||||
* 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;
|
|
||||||
case 0xe0:
|
case 0xe0:
|
||||||
return nve4_screen_compute_setup(screen, screen->base.pushbuf);
|
return nve4_screen_compute_setup(screen, screen->base.pushbuf);
|
||||||
case 0xf0:
|
case 0xf0:
|
||||||
|
|||||||
Reference in New Issue
Block a user