From patchwork Mon Feb 4 15:27:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 2092661 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id CB59FDFE82 for ; Mon, 4 Feb 2013 15:34:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BE579E614C for ; Mon, 4 Feb 2013 07:34:42 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F26BE60D0 for ; Mon, 4 Feb 2013 07:29:07 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 04 Feb 2013 07:27:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,600,1355126400"; d="scan'208";a="257441611" Received: from unknown (HELO dyon.amr.corp.intel.com) ([10.255.12.132]) by orsmga001.jf.intel.com with ESMTP; 04 Feb 2013 07:29:01 -0800 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Mon, 4 Feb 2013 15:27:06 +0000 Message-Id: <1359991705-5254-12-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 1.7.7.5 In-Reply-To: <1359991705-5254-1-git-send-email-damien.lespiau@intel.com> References: <1359991705-5254-1-git-send-email-damien.lespiau@intel.com> Subject: [Intel-gfx] [PATCH 11/90] assembler: Remove struct dp_write_gen6 and struct use gen6_dp X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org We ended up with 2 structures that where exactly the same, so just use one, which happens to be the one Mesa has. Signed-off-by: Damien Lespiau --- assembler/brw_structs.h | 13 ------------- assembler/gram.y | 16 ++++++++-------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/assembler/brw_structs.h b/assembler/brw_structs.h index cfb3028..0e3c430 100644 --- a/assembler/brw_structs.h +++ b/assembler/brw_structs.h @@ -1500,19 +1500,6 @@ struct brw_instruction GLuint end_of_thread:1; } dp_write_gen5; - struct { - GLuint binding_table_index:8; - GLuint msg_control:5; - GLuint msg_type:4; - GLuint send_commit_msg:1; - GLuint pad0:1; - GLuint header_present:1; - GLuint response_length:5; - GLuint msg_length:4; - GLuint pad1:2; - GLuint end_of_thread:1; - } dp_write_gen6; - /** * Message for the Sandybridge Render Cache Data Port. * diff --git a/assembler/gram.y b/assembler/gram.y index 1295d60..538f8f7 100644 --- a/assembler/gram.y +++ b/assembler/gram.y @@ -1298,10 +1298,10 @@ msgtarget: NULL_TOKEN * message header */ $$.bits3.generic_gen5.header_present = 1; - $$.bits3.dp_write_gen6.binding_table_index = $3; - $$.bits3.dp_write_gen6.msg_control = $5; - $$.bits3.dp_write_gen6.msg_type = $7; - $$.bits3.dp_write_gen6.send_commit_msg = $9; + $$.bits3.gen6_dp.binding_table_index = $3; + $$.bits3.gen6_dp.msg_control = $5; + $$.bits3.gen6_dp.msg_type = $7; + $$.bits3.gen6_dp.send_commit_msg = $9; } else if (IS_GENx(5)) { $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DATAPORT_WRITE; @@ -1339,10 +1339,10 @@ msgtarget: NULL_TOKEN $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DP_RC; $$.bits3.generic_gen5.header_present = ($11 != 0); - $$.bits3.dp_write_gen6.binding_table_index = $3; - $$.bits3.dp_write_gen6.msg_control = $5; - $$.bits3.dp_write_gen6.msg_type = $7; - $$.bits3.dp_write_gen6.send_commit_msg = $9; + $$.bits3.gen6_dp.binding_table_index = $3; + $$.bits3.gen6_dp.msg_control = $5; + $$.bits3.gen6_dp.msg_type = $7; + $$.bits3.gen6_dp.send_commit_msg = $9; } else if (IS_GENx(5)) { $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DATAPORT_WRITE;