From patchwork Fri Sep 26 14:03:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 4984221 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EE3E3BEEA9 for ; Fri, 26 Sep 2014 14:05:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3CD77201FE for ; Fri, 26 Sep 2014 14:05:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4F7A6200CA for ; Fri, 26 Sep 2014 14:05:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 786986E780; Fri, 26 Sep 2014 07:05:10 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id EE80F6E770 for ; Fri, 26 Sep 2014 07:05:08 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 26 Sep 2014 07:03:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,604,1406617200"; d="scan'208";a="597272296" Received: from mtbyrne-mobl1.ger.corp.intel.com (HELO strange.ger.corp.intel.com) ([10.252.26.64]) by fmsmga001.fm.intel.com with ESMTP; 26 Sep 2014 07:03:52 -0700 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Fri, 26 Sep 2014 15:03:17 +0100 Message-Id: <1411740204-25709-19-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1411740204-25709-1-git-send-email-damien.lespiau@intel.com> References: <1411740204-25709-1-git-send-email-damien.lespiau@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 19/26] assembler/skl: Add more cache agent for write(...) X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Zhao Yakui Signed-off-by: Zhao Yakui Signed-off-by: Ben Widawsky Signed-off-by: Damien Lespiau --- assembler/gram.y | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/assembler/gram.y b/assembler/gram.y index 157ce79..9689352 100644 --- a/assembler/gram.y +++ b/assembler/gram.y @@ -1671,11 +1671,21 @@ msgtarget: NULL_TOKEN INTEGER RPAREN { if (IS_GENp(8)) { - if ($9 != 0 && - $9 != GEN6_SFID_DATAPORT_RENDER_CACHE && - $9 != GEN7_SFID_DATAPORT_DATA_CACHE && - $9 != HSW_SFID_DATAPORT_DATA_CACHE1) { - error (&@9, "error: wrong cache type\n"); + if (IS_GENp(9)) { + if ($9 != 0 && + $9 != GEN6_SFID_DATAPORT_RENDER_CACHE && + $9 != GEN7_SFID_DATAPORT_DATA_CACHE && + $9 != HSW_SFID_DATAPORT_DATA_CACHE1 && + $9 != SKL_SFID_DATAPORT_DATA_CACHE2) { + error (&@9, "error: wrong cache type\n"); + } + } else { + if ($9 != 0 && + $9 != GEN6_SFID_DATAPORT_RENDER_CACHE && + $9 != GEN7_SFID_DATAPORT_DATA_CACHE && + $9 != HSW_SFID_DATAPORT_DATA_CACHE1) { + error (&@9, "error: wrong cache type\n"); + } } if ($9 == 0) @@ -1732,11 +1742,21 @@ msgtarget: NULL_TOKEN INTEGER COMMA INTEGER RPAREN { if (IS_GENp(8)) { - if ($9 != 0 && - $9 != GEN6_SFID_DATAPORT_RENDER_CACHE && - $9 != GEN7_SFID_DATAPORT_DATA_CACHE && - $9 != HSW_SFID_DATAPORT_DATA_CACHE1) { - error (&@9, "error: wrong cache type\n"); + if (IS_GENp(9)) { + if ($9 != 0 && + $9 != GEN6_SFID_DATAPORT_RENDER_CACHE && + $9 != GEN7_SFID_DATAPORT_DATA_CACHE && + $9 != HSW_SFID_DATAPORT_DATA_CACHE1 && + $9 != SKL_SFID_DATAPORT_DATA_CACHE2) { + error (&@9, "error: wrong cache type\n"); + } + } else { + if ($9 != 0 && + $9 != GEN6_SFID_DATAPORT_RENDER_CACHE && + $9 != GEN7_SFID_DATAPORT_DATA_CACHE && + $9 != HSW_SFID_DATAPORT_DATA_CACHE1) { + error (&@9, "error: wrong cache type\n"); + } } if ($9 == 0)