nouveau/gsp: use correct size for registry rpc.

airlied · airlied · commit b5e69be18549 · 2024-02-02T17:15:16.000+10:00
Timur pointed this out before, and it just slipped my mind, but this might help some things work better, around pcie power management. Fixes: 8d55b0a ("nouveau/gsp: add some basic registry entries.") Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/576336/
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
@@ -1078,7 +1078,6 @@ r535_gsp_rpc_set_registry(struct nvkm_gsp *gsp)
 	if (IS_ERR(rpc))
 		return PTR_ERR(rpc);
 
-	rpc->size = sizeof(*rpc);
 	rpc->numEntries = NV_GSP_REG_NUM_ENTRIES;
 
 	str_offset = offsetof(typeof(*rpc), entries[NV_GSP_REG_NUM_ENTRIES]);
@@ -1094,6 +1093,7 @@ r535_gsp_rpc_set_registry(struct nvkm_gsp *gsp)
 		strings += name_len;
 		str_offset += name_len;
 	}
+	rpc->size = str_offset;
 
 	return nvkm_gsp_rpc_wr(gsp, rpc, false);
 }

Original file line number	Diff line number	Diff line change
`@@ -1078,7 +1078,6 @@ r535_gsp_rpc_set_registry(struct nvkm_gsp *gsp)`
`1078`	`1078`	`if (IS_ERR(rpc))`
`1079`	`1079`	`return PTR_ERR(rpc);`
`1080`	`1080`
`1081`		`- rpc->size = sizeof(*rpc);`
`1082`	`1081`	`rpc->numEntries = NV_GSP_REG_NUM_ENTRIES;`
`1083`	`1082`
`1084`	`1083`	`str_offset = offsetof(typeof(*rpc), entries[NV_GSP_REG_NUM_ENTRIES]);`
`@@ -1094,6 +1093,7 @@ r535_gsp_rpc_set_registry(struct nvkm_gsp *gsp)`
`1094`	`1093`	`strings += name_len;`
`1095`	`1094`	`str_offset += name_len;`
`1096`	`1095`	`}`
	`1096`	`+ rpc->size = str_offset;`
`1097`	`1097`
`1098`	`1098`	`return nvkm_gsp_rpc_wr(gsp, rpc, false);`
`1099`	`1099`	`}`