KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

anv,blorp,crocus,i965,iris: Use devinfo->max_threads_per_psd for gfx8+ 

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13866>
This commit is contained in:
Jordan Justen 2021-11-01 17:22:51 -07:00 committed by Marge Bot
parent 08a897fa38
commit f0692365a2
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/crocus/crocus_state.c
View File

@ -6464,7 +6464,8 @@ crocus_upload_dirty_render_state(struct crocus_context *ice,
ps.BindingTableEntryCount = shader->bt.size_bytes / 4;
ps.FloatingPointMode = prog_data->use_alt_mode;
#if GFX_VER >= 8
ps.MaximumNumberofThreadsPerPSD = 64 - 2;
ps.MaximumNumberofThreadsPerPSD =
batch->screen->devinfo.max_threads_per_psd - 2;
#else
ps.MaximumNumberofThreads = batch->screen->devinfo.max_wm_threads - 1;
#endif

5
src/gallium/drivers/iris/iris_state.c
View File

@ -4567,9 +4567,8 @@ iris_store_fs_state(const struct intel_device_info *devinfo,
ps.VectorMaskEnable = true;
ps.BindingTableEntryCount = shader->bt.size_bytes / 4;
ps.FloatingPointMode = prog_data->use_alt_mode;
ps.MaximumNumberofThreadsPerPSD = (GFX_VERx10 >= 125 ? 96 - 1 :
GFX_VER == 8 ? 64 - 2 :
64 - 1);
ps.MaximumNumberofThreadsPerPSD =
devinfo->max_threads_per_psd - (GFX_VER == 8 ? 2 : 1);
ps.PushConstantEnable = prog_data->ubo_ranges[0].length > 0;

9
src/intel/blorp/blorp_genX_exec.h
View File

@ -890,12 +890,9 @@ blorp_emit_ps_config(struct blorp_batch *batch,
*
* In Gfx8 the format is U8-2 whereas in Gfx9+ it is U9-1.
*/
if (GFX_VERx10 >= 125)
ps.MaximumNumberofThreadsPerPSD = 96 - 1;
else if (GFX_VER >= 9)
ps.MaximumNumberofThreadsPerPSD = 64 - 1;
else
ps.MaximumNumberofThreadsPerPSD = 64 - 2;
const struct intel_device_info *devinfo = batch->blorp->compiler->devinfo;
ps.MaximumNumberofThreadsPerPSD =
devinfo->max_threads_per_psd - (GFX_VER == 8 ? 2 : 1);
switch (params->fast_clear_op) {
case ISL_AUX_OP_NONE:

9
src/intel/vulkan/genX_pipeline.c
View File

@ -2329,12 +2329,9 @@ emit_3dstate_ps(struct anv_graphics_pipeline *pipeline,
ps.SampleMask = 0xff;
#endif
#if GFX_VERx10 >= 125
ps.MaximumNumberofThreadsPerPSD = 96 - 1;
#elif GFX_VER >= 9
ps.MaximumNumberofThreadsPerPSD = 64 - 1;
#elif GFX_VER >= 8
ps.MaximumNumberofThreadsPerPSD = 64 - 2;
#if GFX_VER >= 8
ps.MaximumNumberofThreadsPerPSD =
devinfo->max_threads_per_psd - (GFX_VER == 8 ? 2 : 1);
#else
ps.MaximumNumberofThreads = devinfo->max_wm_threads - 1;
#endif