OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno/rnn: fix use-group

Browse Source 
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>
This commit is contained in:
Rob Clark
2020-07-28 11:53:26 -07:00
committed by Marge Bot
parent 14a7ca577f
commit 0586238036
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/freedreno/registers/mdp/mdp4.xml
View File

@@ -210,7 +210,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
<reg32 offset="0x0200" name="CSC_CONFIG"/> <reg32 offset="0x0200" name="CSC_CONFIG"/>
<array offset="0x2000" name="CSC" length="1" stride="0x700"> <array offset="0x2000" name="CSC" length="1" stride="0x700">
<use-group name="mdp4_csc"/> <use-group ref="mdp4_csc"/>
</array> </array>
</array> </array>
@@ -265,7 +265,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
<reg32 offset="0x1004" name="FETCH_CONFIG"/> <reg32 offset="0x1004" name="FETCH_CONFIG"/>
<array offset="0x3000" name="CSC" length="1" stride="0x700"> <array offset="0x3000" name="CSC" length="1" stride="0x700">
<use-group name="mdp4_csc"/> <use-group ref="mdp4_csc"/>
</array> </array>
</array> </array>
@@ -331,7 +331,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
<reg32 offset="0x1008" name="SOLID_COLOR"/> <reg32 offset="0x1008" name="SOLID_COLOR"/>
<array offset="0x4000" name="CSC" length="1" stride="0x700"> <array offset="0x4000" name="CSC" length="1" stride="0x700">
<use-group name="mdp4_csc"/> <use-group ref="mdp4_csc"/>
</array> </array>
</array> </array>

2
src/freedreno/rnn/rnn.c
View File

@@ -467,7 +467,7 @@ static struct rnndelem *trydelem(struct rnndb *db, char *file, xmlNode *node) {
res->type = RNN_ETYPE_USE_GROUP; res->type = RNN_ETYPE_USE_GROUP;
xmlAttr *attr = node->properties; xmlAttr *attr = node->properties;
while (attr) { while (attr) {
if (!strcmp(attr->name, "name")) { if (!strcmp(attr->name, "ref")) {
res->name = strdup(getattrib(db, file, node->line, attr)); res->name = strdup(getattrib(db, file, node->line, attr));
} else { } else {
rnn_err(db, "%s:%d: wrong attribute \"%s\" for %s\n", file, node->line, attr->name, node->name); rnn_err(db, "%s:%d: wrong attribute \"%s\" for %s\n", file, node->line, attr->name, node->name);