- /* CACHE_NEW_WM_PROG */
- wm->thread0.grf_reg_count = ALIGN(brw->wm.prog_data->total_grf, 16) / 16 - 1;
- wm->wm9.grf_reg_count_2 = ALIGN(brw->wm.prog_data->total_grf_16, 16) / 16 - 1;
- wm->thread0.kernel_start_pointer = brw->wm.prog_bo->offset >> 6; /* reloc */
- /* reloc */
- wm->wm9.kernel_start_pointer_2 = (brw->wm.prog_bo->offset +
- brw->wm.prog_data->prog_offset_16) >> 6;
+ /* BRW_NEW_PROGRAM_CACHE | BRW_NEW_FS_PROG_DATA */
+ wm->thread0.grf_reg_count = prog_data->reg_blocks;
+ wm->wm9.grf_reg_count_2 = prog_data->reg_blocks_16;
+
+ wm->thread0.kernel_start_pointer =
+ brw_program_reloc(brw,
+ brw->wm.base.state_offset +
+ offsetof(struct brw_wm_unit_state, thread0),
+ brw->wm.base.prog_offset +
+ (wm->thread0.grf_reg_count << 1)) >> 6;
+
+ wm->wm9.kernel_start_pointer_2 =
+ brw_program_reloc(brw,
+ brw->wm.base.state_offset +
+ offsetof(struct brw_wm_unit_state, wm9),
+ brw->wm.base.prog_offset +
+ prog_data->prog_offset_16 +
+ (wm->wm9.grf_reg_count_2 << 1)) >> 6;
+