From: Rob Clark <robdclark@chromium.org>
Date: Tue, 28 Jul 2020 16:59:58 +0000 (-0700)
Subject: freedreno/rnn: relax Hexadecimal to HexOrNumber
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b76e5f3a4de6f488d00eeedeabba316de48d042;p=mesa.git

freedreno/rnn: relax Hexadecimal to HexOrNumber

We are already using non-hex offsets to describe pm4 packet payloads.
Let's just permit this in the schema, rather than updating all the xml
to use hex.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6107>
---

diff --git a/src/freedreno/registers/rules-ng.xsd b/src/freedreno/registers/rules-ng.xsd
index 92f2aac942c..ad94f64cbe0 100644
--- a/src/freedreno/registers/rules-ng.xsd
+++ b/src/freedreno/registers/rules-ng.xsd
@@ -83,7 +83,7 @@
 		<attribute name="bare" type="rng:Boolean" use="optional" />
 		<attribute name="prefix" type="NMTOKENS" use="optional" />
 		<attribute name="width" type="rng:DomainWidth" use="optional" />
-		<attribute name="size" type="rng:Hexadecimal" use="optional" />
+		<attribute name="size" type="rng:HexOrNumber" use="optional" />
 	</complexType>
 
 	<complexType name="groupType">
@@ -108,7 +108,7 @@
 			<group ref="rng:regarrayGroup" />
 		</choice>
 		<attribute name="name" type="NMTOKEN" use="required" />
-		<attribute name="offset" type="rng:Hexadecimal" use="required" />
+		<attribute name="offset" type="rng:HexOrNumber" use="required" />
 		<attribute name="stride" type="rng:HexOrNumber" use="required" />
 		<attribute name="length" type="rng:HexOrNumber" use="required" />
 		<attribute name="varset" type="NMTOKEN" use="optional" />
@@ -125,7 +125,7 @@
 			<group ref="rng:regarrayGroup" minOccurs="0" />
 		</choice>
 		<attribute name="name" type="NMTOKEN" use="optional" />
-		<attribute name="offset" type="rng:Hexadecimal" use="optional" />
+		<attribute name="offset" type="rng:HexOrNumber" use="optional" />
 		<attribute name="stride" type="rng:HexOrNumber" use="optional" />
 		<attribute name="length" type="rng:HexOrNumber" use="optional" />
 		<attribute name="varset" type="NMTOKEN" use="optional" />
@@ -146,7 +146,7 @@
 			<element ref="rng:bitfield" />
 		</choice>
 		<attribute name="name" type="NMTOKEN" use="required" />
-		<attribute name="offset" type="rng:Hexadecimal" use="required" />
+		<attribute name="offset" type="rng:HexOrNumber" use="required" />
 		<attribute name="access" type="rng:Access" default="rw" use="optional" />
 		<attribute name="type" type="NMTOKENS" use="optional" />
 		<attribute name="shr" type="nonNegativeInteger" use="optional" />