freedreno/rnn: fix use-group
authorRob Clark <robdclark@chromium.org>
Tue, 28 Jul 2020 18:53:26 +0000 (11:53 -0700)
committerMarge Bot <eric+marge@anholt.net>
Wed, 29 Jul 2020 14:30:35 +0000 (14:30 +0000)
The schema describes the attribute as "ref" rather than "name".  Which
makes more sense.

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

src/freedreno/registers/mdp/mdp4.xml
src/freedreno/rnn/rnn.c

index a84f53080401c36530a685d35502a875ffaac819..dfccecdca2e218dd711d8c921e600e2ecd0d5470 100644 (file)
@@ -210,7 +210,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
                <reg32 offset="0x0200" name="CSC_CONFIG"/>
 
                <array offset="0x2000" name="CSC" length="1" stride="0x700">
-                       <use-group name="mdp4_csc"/>
+                       <use-group ref="mdp4_csc"/>
                </array>
        </array>
 
@@ -265,7 +265,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
 
                <reg32 offset="0x1004" name="FETCH_CONFIG"/>
                <array offset="0x3000" name="CSC" length="1" stride="0x700">
-                       <use-group name="mdp4_csc"/>
+                       <use-group ref="mdp4_csc"/>
                </array>
        </array>
 
@@ -331,7 +331,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
                <reg32 offset="0x1008" name="SOLID_COLOR"/>
 
                <array offset="0x4000" name="CSC" length="1" stride="0x700">
-                       <use-group name="mdp4_csc"/>
+                       <use-group ref="mdp4_csc"/>
                </array>
        </array>
 
index 1a1103706d90a291a59b9fc8290a52f621c7a0cc..4851e294afcf5dad8ec9474b85a7b5444028baea 100644 (file)
@@ -467,7 +467,7 @@ static struct rnndelem *trydelem(struct rnndb *db, char *file, xmlNode *node) {
                res->type = RNN_ETYPE_USE_GROUP;
                xmlAttr *attr = node->properties;
                while (attr) {
-                       if (!strcmp(attr->name, "name")) {
+                       if (!strcmp(attr->name, "ref")) {
                                res->name = strdup(getattrib(db, file, node->line, attr));
                        } else {
                                rnn_err(db, "%s:%d: wrong attribute \"%s\" for %s\n", file, node->line, attr->name, node->name);