From 47e974354715702a75ad2f1ee803b72cbd8cc9f1 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sun, 1 Sep 2019 21:57:05 -0500 Subject: [PATCH] intel/fs: Fix FB write inst groups This commit does two things. First, it simplifies the way we compute the FB write group bit. There's no reason to use a ternary because inst->group / 16 can only be 0 or 1. Second, it fixes an order-of- operations bug where the ternary wasn't selecting between (1 << 11) and 0 but between (1 << 11) and 0 | brw_dp_write_desc(...). Fixes: 0d9648416 "intel/compiler: Use generic SEND for Gen7+ FB writes" Reviewed-by: Francisco Jerez Reviewed-by: Kenneth Graunke --- src/intel/compiler/brw_fs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index 8bf11f9aa93..381d10bfccd 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -4447,7 +4447,7 @@ lower_fb_write_logical_send(const fs_builder &bld, fs_inst *inst, uint32_t ex_desc = 0; inst->desc = - (inst->group / 16) ? (1 << 11) : 0 | /* rt slot group */ + (inst->group / 16) << 11 | /* rt slot group */ brw_dp_write_desc(devinfo, inst->target, msg_ctl, GEN6_DATAPORT_WRITE_MESSAGE_RENDER_TARGET_WRITE, inst->last_rt, false); -- 2.30.2