Mesa (master): freedreno/rnn: fix use-group

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 0586238036cbc00cf3c6ec3cd7ac2e14bf635b7a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0586238036cbc00cf3c6ec3cd7ac2e14bf635b7a

Author: Rob Clark <robdclark at chromium.org>
Date:   Tue Jul 28 11:53:26 2020 -0700

freedreno/rnn: fix use-group

The schema describes the attribute as "ref" rather than "name".  Which
makes more sense.

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

---

 src/freedreno/registers/mdp/mdp4.xml | 6 +++---
 src/freedreno/rnn/rnn.c              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/freedreno/registers/mdp/mdp4.xml b/src/freedreno/registers/mdp/mdp4.xml
index a84f5308040..dfccecdca2e 100644
--- a/src/freedreno/registers/mdp/mdp4.xml
+++ b/src/freedreno/registers/mdp/mdp4.xml
@@ -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>
 
diff --git a/src/freedreno/rnn/rnn.c b/src/freedreno/rnn/rnn.c
index 1a1103706d9..4851e294afc 100644
--- a/src/freedreno/rnn/rnn.c
+++ b/src/freedreno/rnn/rnn.c
@@ -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);