From patchwork Mon Feb 4 15:27:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 2092641 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 62395DFE82 for ; Mon, 4 Feb 2013 15:33:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5210DE5EA1 for ; Mon, 4 Feb 2013 07:33:50 -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 634F7E5FBF for ; Mon, 4 Feb 2013 07:29:06 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 04 Feb 2013 07:27:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,600,1355126400"; d="scan'208";a="257441557" Received: from unknown (HELO dyon.amr.corp.intel.com) ([10.255.12.132]) by orsmga001.jf.intel.com with ESMTP; 04 Feb 2013 07:28:58 -0800 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Mon, 4 Feb 2013 15:27:03 +0000 Message-Id: <1359991705-5254-9-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 08/90] assembler: Rename dp_read_gen6 to gen6_dp_sampler_const_cache 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 The purpose of this commit is to synchronize opcode definitions across the gen4asm assembler and mesa. Signed-off-by: Damien Lespiau --- assembler/brw_structs.h | 27 ++++++++++++++++----------- assembler/gram.y | 6 +++--- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/assembler/brw_structs.h b/assembler/brw_structs.h index e4fdb51..e2be147 100644 --- a/assembler/brw_structs.h +++ b/assembler/brw_structs.h @@ -1469,17 +1469,22 @@ struct brw_instruction GLuint end_of_thread:1; } dp_read_gen5; - struct { - GLuint binding_table_index:8; - GLuint msg_control:5; - GLuint msg_type:3; - GLuint pad0:3; - GLuint header_present:1; - GLuint response_length:5; - GLuint msg_length:4; - GLuint pad1:2; - GLuint end_of_thread:1; - } dp_read_gen6; + /** + * Message for the Sandybridge Sampler Cache or Constant Cache Data Port. + * + * See the Sandybridge PRM, Volume 4 Part 1, Section 3.9.2.1.1. + **/ + struct { + GLuint binding_table_index:8; + GLuint msg_control:5; + GLuint msg_type:3; + GLuint pad0:3; + GLuint header_present:1; + GLuint response_length:5; + GLuint msg_length:4; + GLuint pad1:2; + GLuint end_of_thread:1; + } gen6_dp_sampler_const_cache; struct { GLuint binding_table_index:8; diff --git a/assembler/gram.y b/assembler/gram.y index 9380f44..70caeb4 100644 --- a/assembler/gram.y +++ b/assembler/gram.y @@ -1260,9 +1260,9 @@ msgtarget: NULL_TOKEN $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DP_SC; $$.bits3.generic_gen5.header_present = 1; - $$.bits3.dp_read_gen6.binding_table_index = $3; - $$.bits3.dp_read_gen6.msg_control = $7; - $$.bits3.dp_read_gen6.msg_type = $9; + $$.bits3.gen6_dp_sampler_const_cache.binding_table_index = $3; + $$.bits3.gen6_dp_sampler_const_cache.msg_control = $7; + $$.bits3.gen6_dp_sampler_const_cache.msg_type = $9; } else if (IS_GENx(5)) { $$.bits2.send_gen5.sfid = BRW_MESSAGE_TARGET_DATAPORT_READ;