fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 17:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/gen7.5+: Disable resource streamer during GPGPU workloads.

Browse source 
The RS and hardware binding tables are only supported on the 3D
pipeline and can lead to corruption if left enabled during a GPGPU
workload.  Disable it when switching to the GPGPU (or media) pipeline
and re-enable it when switching back to the 3D pipeline.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
This commit is contained in:
Francisco Jerez 2016-01-03 10:06:52 -08:00
parent c8df0e7bf3
commit 0556b87de4
3 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_binding_tables.c
View file

@ -365,7 +365,7 @@ gen7_disable_hw_binding_tables(struct brw_context *brw)
/**
* Enable hardware binding tables and set up the binding table pool.
*/
static void
void
gen7_enable_hw_binding_tables(struct brw_context *brw)
{
if (!brw->use_resource_streamer)

40
src/mesa/drivers/dri/i965/brw_misc_state.c
View file

@ -868,6 +868,26 @@ brw_emit_select_pipeline(struct brw_context *brw, enum brw_pipeline pipeline)
const uint32_t _3DSTATE_PIPELINE_SELECT =
is_965 ? CMD_PIPELINE_SELECT_965 : CMD_PIPELINE_SELECT_GM45;
if (brw->use_resource_streamer && pipeline != BRW_RENDER_PIPELINE) {
/* From "BXML » GT » MI » vol1a GPU Overview » [Instruction]
* PIPELINE_SELECT [DevBWR+]":
*
* Project: HSW, BDW, CHV, SKL, BXT
*
* Hardware Binding Tables are only supported for 3D
* workloads. Resource streamer must be enabled only for 3D
* workloads. Resource streamer must be disabled for Media and GPGPU
* workloads.
*/
BEGIN_BATCH(1);
OUT_BATCH(MI_RS_CONTROL | 0);
ADVANCE_BATCH();
gen7_disable_hw_binding_tables(brw);
/* XXX - Disable gather constant pool too when we start using it. */
}
if (brw->gen >= 8 && brw->gen < 10) {
/* From the Broadwell PRM, Volume 2a: Instructions, PIPELINE_SELECT:
*
@ -968,6 +988,26 @@ brw_emit_select_pipeline(struct brw_context *brw, enum brw_pipeline pipeline)
OUT_BATCH(0);
ADVANCE_BATCH();
}
if (brw->use_resource_streamer && pipeline == BRW_RENDER_PIPELINE) {
/* From "BXML » GT » MI » vol1a GPU Overview » [Instruction]
* PIPELINE_SELECT [DevBWR+]":
*
* Project: HSW, BDW, CHV, SKL, BXT
*
* Hardware Binding Tables are only supported for 3D
* workloads. Resource streamer must be enabled only for 3D
* workloads. Resource streamer must be disabled for Media and GPGPU
* workloads.
*/
BEGIN_BATCH(1);
OUT_BATCH(MI_RS_CONTROL | 1);
ADVANCE_BATCH();
gen7_enable_hw_binding_tables(brw);
/* XXX - Re-enable gather constant pool here. */
}
}
/**

1
src/mesa/drivers/dri/i965/brw_state.h
View file

@ -396,6 +396,7 @@ void gen7_update_binding_table_from_array(struct brw_context *brw,
gl_shader_stage stage,
const uint32_t* binding_table,
int num_surfaces);
void gen7_enable_hw_binding_tables(struct brw_context *brw);
void gen7_disable_hw_binding_tables(struct brw_context *brw);
void gen7_reset_hw_bt_pool_offsets(struct brw_context *brw);