Add a helper function which computes the size of a command.
Signed-off-by: Eliot Courtney <[email protected]>
---
drivers/gpu/nova-core/gsp/cmdq.rs | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/nova-core/gsp/cmdq.rs
b/drivers/gpu/nova-core/gsp/cmdq.rs
index 1547687834f8..f832252ae45c 100644
--- a/drivers/gpu/nova-core/gsp/cmdq.rs
+++ b/drivers/gpu/nova-core/gsp/cmdq.rs
@@ -437,6 +437,15 @@ struct GspMessage<'a> {
contents: (&'a [u8], &'a [u8]),
}
+/// Computes the total size of the command (not including the
[`GspMsgElement`] header), including
+/// its variable-length payload.
+fn command_size<M>(command: &M) -> usize
+where
+ M: CommandToGsp,
+{
+ size_of::<M::Command>() + command.variable_payload_len()
+}
+
/// GSP command queue.
///
/// Provides the ability to send commands and receive messages from the GSP
using a shared memory
@@ -513,7 +522,7 @@ pub(crate) fn send_command<M>(&mut self, bar: &Bar0,
command: M) -> Result
// This allows all error types, including `Infallible`, to be used for
`M::InitError`.
Error: From<M::InitError>,
{
- let command_size = size_of::<M::Command>() +
command.variable_payload_len();
+ let command_size = command_size(&command);
let dst = self
.gsp_mem
.allocate_command(command_size, Delta::from_secs(1))?;
--
2.53.0
