Skip to contentSkip to conversation

nouveau/gsp: use correct size for registry rpc.

PATCH In review Dave Airlie 2 participants 2 messages Jan 30, 2024 – Feb 5, 2024

Subsystems (3)
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

PATCH 1/1 nouveau/gsp: use correct size for registry rpc.

From: Dave Airlie <[email protected]>

Timur pointed this out before, and it just slipped my mind, but this might help some things work better, around pcie power management.

Fixes 8d55b0a940bb ("nouveau/gsp: add some basic registry entries.")
---
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +1 -1
index 9ee58e2a0eb2..5e1fa176aac4 100644
@@ -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);
 }
Signature · 1 line
2.43.0
#1 lore raw
Quoted 8 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Timur pointed this out before, and it just slipped my mind, but this might help some things work better, around pcie power management.

Fixes 8d55b0a940bb ("nouveau/gsp: add some basic registry entries.")

Added stable CC for v6.7 and applied it to drm-misc-fixes.

Quoted 24 lines
---
  drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +1 -1
index 9ee58e2a0eb2..5e1fa176aac4 100644
@@ -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);
  }