diff mbox

[i-g-t,19/26] assembler/skl: Add more cache agent for write(...)

Message ID 1411740204-25709-19-git-send-email-damien.lespiau@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lespiau, Damien Sept. 26, 2014, 2:03 p.m. UTC 
From: Zhao Yakui <yakui.zhao@intel.com>

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 assembler/gram.y | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)
diff mbox

Patch

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)