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 92f2aac942cffbe89d506f4cd9abe58af13b5ae8..ad94f64cbe053d3f9f2171ca3dbb4d1a456a396c 100644 (file)
--- 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" />\r
                <attribute name="prefix" type="NMTOKENS" use="optional" />\r
                <attribute name="width" type="rng:DomainWidth" use="optional" />\r
-               <attribute name="size" type="rng:Hexadecimal" use="optional" />\r
+               <attribute name="size" type="rng:HexOrNumber" use="optional" />\r
        </complexType>\r
 \r
        <complexType name="groupType">\r
@@ -108,7 +108,7 @@
                        <group ref="rng:regarrayGroup" />\r
                </choice>\r
                <attribute name="name" type="NMTOKEN" use="required" />\r
-               <attribute name="offset" type="rng:Hexadecimal" use="required" />\r
+               <attribute name="offset" type="rng:HexOrNumber" use="required" />\r
                <attribute name="stride" type="rng:HexOrNumber" use="required" />\r
                <attribute name="length" type="rng:HexOrNumber" use="required" />\r
                <attribute name="varset" type="NMTOKEN" use="optional" />\r
@@ -125,7 +125,7 @@
                        <group ref="rng:regarrayGroup" minOccurs="0" />\r
                </choice>\r
                <attribute name="name" type="NMTOKEN" use="optional" />\r
-               <attribute name="offset" type="rng:Hexadecimal" use="optional" />\r
+               <attribute name="offset" type="rng:HexOrNumber" use="optional" />\r
                <attribute name="stride" type="rng:HexOrNumber" use="optional" />\r
                <attribute name="length" type="rng:HexOrNumber" use="optional" />\r
                <attribute name="varset" type="NMTOKEN" use="optional" />\r
@@ -146,7 +146,7 @@
                        <element ref="rng:bitfield" />\r
                </choice>\r
                <attribute name="name" type="NMTOKEN" use="required" />\r
-               <attribute name="offset" type="rng:Hexadecimal" use="required" />\r
+               <attribute name="offset" type="rng:HexOrNumber" use="required" />\r
                <attribute name="access" type="rng:Access" default="rw" use="optional" />\r
                <attribute name="type" type="NMTOKENS" use="optional" />\r
                <attribute name="shr" type="nonNegativeInteger" use="optional" />\r