diff options
| author | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2016-09-23 00:41:23 +0300 |
|---|---|---|
| committer | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2016-09-23 10:12:06 +0300 |
| commit | 94d0e7dc0848a5f70a550f2294e459eab51ace8f (patch) | |
| tree | f68f3d9c195a32c881f500a87be7e72fb11a53c7 /src/mesa/drivers/dri/i965/gen7_cs_state.c | |
| parent | bc24590f0c579a2528fd94eb8d40dd4ce12eba29 (diff) | |
| download | external_mesa3d-94d0e7dc0848a5f70a550f2294e459eab51ace8f.zip external_mesa3d-94d0e7dc0848a5f70a550f2294e459eab51ace8f.tar.gz external_mesa3d-94d0e7dc0848a5f70a550f2294e459eab51ace8f.tar.bz2 | |
i965: get rid of duplicated values from gen_device_info
Now that we have gen_device_info mutable, we can update its values and drop
all copies we had in brw_context.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_cs_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_cs_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c index 862b915..9ba5dd2 100644 --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c @@ -97,7 +97,7 @@ brw_upload_cs_state(struct brw_context *brw) const uint32_t vfe_gpgpu_mode = brw->gen == 7 ? SET_FIELD(1, GEN7_MEDIA_VFE_STATE_GPGPU_MODE) : 0; const uint32_t subslices = MAX2(brw->screen->subslice_total, 1); - OUT_BATCH(SET_FIELD(brw->max_cs_threads * subslices - 1, + OUT_BATCH(SET_FIELD(devinfo->max_cs_threads * subslices - 1, MEDIA_VFE_STATE_MAX_THREADS) | SET_FIELD(vfe_num_urb_entries, MEDIA_VFE_STATE_URB_ENTRIES) | SET_FIELD(1, MEDIA_VFE_STATE_RESET_GTW_TIMER) | @@ -163,7 +163,7 @@ brw_upload_cs_state(struct brw_context *brw) brw->gen >= 8 ? SET_FIELD(cs_prog_data->threads, GEN8_MEDIA_GPGPU_THREAD_COUNT) : SET_FIELD(cs_prog_data->threads, MEDIA_GPGPU_THREAD_COUNT); - assert(cs_prog_data->threads <= brw->max_cs_threads); + assert(cs_prog_data->threads <= devinfo->max_cs_threads); const uint32_t slm_size = encode_slm_size(devinfo->gen, prog_data->total_shared); |