From ebc75245032f58bbd8d24900c1471e74eb768077 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 13 Jun 2014 20:51:12 -0700 Subject: [PATCH] Revert "i965: Add 'wait' instruction support" This reverts commit 20be3ff57670529a410b30a1008a71e768d08428. No evidence of ever being used. --- src/mesa/drivers/dri/i965/brw_eu.h | 2 -- src/mesa/drivers/dri/i965/brw_eu_emit.c | 16 ---------------- src/mesa/drivers/dri/i965/brw_reg.h | 16 ---------------- 3 files changed, 34 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h index 83f1eba999c..a610f2da9a9 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.h +++ b/src/mesa/drivers/dri/i965/brw_eu.h @@ -349,8 +349,6 @@ struct brw_instruction *brw_JMPI(struct brw_compile *p, struct brw_reg index, void brw_NOP(struct brw_compile *p); -void brw_WAIT(struct brw_compile *p); - /* Special case: there is never a destination, execution size will be * taken from src0: */ diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c index 68b03b7a901..5859e2bd3a7 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_emit.c +++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c @@ -1807,22 +1807,6 @@ void brw_CMP(struct brw_compile *p, } } -/* Issue 'wait' instruction for n1, host could program MMIO - to wake up thread. */ -void brw_WAIT (struct brw_compile *p) -{ - struct brw_instruction *insn = next_insn(p, BRW_OPCODE_WAIT); - struct brw_reg src = brw_notification_1_reg(); - - brw_set_dest(p, insn, src); - brw_set_src0(p, insn, src); - brw_set_src1(p, insn, brw_null_reg()); - insn->header.execution_size = 0; /* must */ - insn->header.predicate_control = 0; - insn->header.compression_control = 0; -} - - /*********************************************************************** * Helpers for the various SEND message types: */ diff --git a/src/mesa/drivers/dri/i965/brw_reg.h b/src/mesa/drivers/dri/i965/brw_reg.h index 38c0ae58739..fc2e0b0ba22 100644 --- a/src/mesa/drivers/dri/i965/brw_reg.h +++ b/src/mesa/drivers/dri/i965/brw_reg.h @@ -632,22 +632,6 @@ brw_acc_reg(void) return brw_vec8_reg(BRW_ARCHITECTURE_REGISTER_FILE, BRW_ARF_ACCUMULATOR, 0); } -static inline struct brw_reg -brw_notification_1_reg(void) -{ - - return brw_reg(BRW_ARCHITECTURE_REGISTER_FILE, - BRW_ARF_NOTIFICATION_COUNT, - 1, - BRW_REGISTER_TYPE_UD, - BRW_VERTICAL_STRIDE_0, - BRW_WIDTH_1, - BRW_HORIZONTAL_STRIDE_0, - BRW_SWIZZLE_XXXX, - WRITEMASK_X); -} - - static inline struct brw_reg brw_flag_reg(int reg, int subreg) { -- 2.30.2