nvidia(ctrla082): rename some fields to match A081

This commit is contained in:
Matt Bilker
2022-12-07 12:30:22 +00:00
parent 3ce87825cd
commit 3c35e581cf
2 changed files with 14 additions and 12 deletions

View File

@@ -95,8 +95,8 @@ trait VgpuConfigLike {
fn vgpu_name(&mut self) -> &mut [u8; 32]; fn vgpu_name(&mut self) -> &mut [u8; 32];
fn vgpu_class(&mut self) -> &mut [u8; 32]; fn vgpu_class(&mut self) -> &mut [u8; 32];
fn vgpu_signature(&mut self) -> &mut [u8; 128]; fn vgpu_signature(&mut self) -> &mut [u8; 128];
fn features(&mut self) -> &mut [u8; 128]; fn license(&mut self) -> &mut [u8; 128];
fn max_instances(&mut self) -> &mut u32; fn max_instance(&mut self) -> &mut u32;
fn num_heads(&mut self) -> &mut u32; fn num_heads(&mut self) -> &mut u32;
fn max_resolution_x(&mut self) -> &mut u32; fn max_resolution_x(&mut self) -> &mut u32;
fn max_resolution_y(&mut self) -> &mut u32; fn max_resolution_y(&mut self) -> &mut u32;
@@ -147,8 +147,8 @@ impl VgpuConfigLike for NvA082CtrlCmdHostVgpuDeviceGetVgpuTypeInfoParams {
impl_trait_fn!(vgpu_name, [u8; 32]); impl_trait_fn!(vgpu_name, [u8; 32]);
impl_trait_fn!(vgpu_class, [u8; 32]); impl_trait_fn!(vgpu_class, [u8; 32]);
impl_trait_fn!(vgpu_signature, [u8; 128]); impl_trait_fn!(vgpu_signature, [u8; 128]);
impl_trait_fn!(features, [u8; 128]); impl_trait_fn!(license, [u8; 128]);
impl_trait_fn!(max_instances, u32); impl_trait_fn!(max_instance, u32);
impl_trait_fn!(num_heads, u32); impl_trait_fn!(num_heads, u32);
impl_trait_fn!(max_resolution_x, u32); impl_trait_fn!(max_resolution_x, u32);
impl_trait_fn!(max_resolution_y, u32); impl_trait_fn!(max_resolution_y, u32);
@@ -183,8 +183,8 @@ impl VgpuConfigLike for NvA081CtrlVgpuInfo {
impl_trait_fn!(vgpu_name, [u8; 32]); impl_trait_fn!(vgpu_name, [u8; 32]);
impl_trait_fn!(vgpu_class, [u8; 32]); impl_trait_fn!(vgpu_class, [u8; 32]);
impl_trait_fn!(vgpu_signature, [u8; 128]); impl_trait_fn!(vgpu_signature, [u8; 128]);
impl_trait_fn!(license => features, [u8; 128]); impl_trait_fn!(license, [u8; 128]);
impl_trait_fn!(max_instance => max_instances, u32); impl_trait_fn!(max_instance, u32);
impl_trait_fn!(num_heads, u32); impl_trait_fn!(num_heads, u32);
impl_trait_fn!(max_resolution_x, u32); impl_trait_fn!(max_resolution_x, u32);
impl_trait_fn!(max_resolution_y, u32); impl_trait_fn!(max_resolution_y, u32);
@@ -713,10 +713,10 @@ fn apply_profile_override<C: VgpuConfigLike>(
str: [ str: [
card_name => vgpu_name, card_name => vgpu_name,
vgpu_type => vgpu_class, vgpu_type => vgpu_class,
features, features => license,
], ],
copy: [ copy: [
max_instances, max_instances => max_instance,
num_displays => num_heads, num_displays => num_heads,
display_width => max_resolution_x, display_width => max_resolution_x,
display_height => max_resolution_y, display_height => max_resolution_y,

View File

@@ -12,8 +12,8 @@ pub struct NvA082CtrlCmdHostVgpuDeviceGetVgpuTypeInfoParams {
pub vgpu_name: [u8; 32], pub vgpu_name: [u8; 32],
pub vgpu_class: [u8; 32], pub vgpu_class: [u8; 32],
pub vgpu_signature: [u8; 128], pub vgpu_signature: [u8; 128],
pub features: [u8; 128], pub license: [u8; 128],
pub max_instances: u32, pub max_instance: u32,
pub num_heads: u32, pub num_heads: u32,
pub max_resolution_x: u32, pub max_resolution_x: u32,
pub max_resolution_y: u32, pub max_resolution_y: u32,
@@ -21,6 +21,8 @@ pub struct NvA082CtrlCmdHostVgpuDeviceGetVgpuTypeInfoParams {
pub frl_config: u32, pub frl_config: u32,
pub cuda_enabled: u32, pub cuda_enabled: u32,
pub ecc_supported: u32, pub ecc_supported: u32,
// This field might not exist anymore and instead the space became padding as
// `NVA081_CTRL_VGPU_INFO` forces the alignment of `vdevId` to `8`.
pub mig_instance_size: u32, pub mig_instance_size: u32,
pub multi_vgpu_supported: u32, pub multi_vgpu_supported: u32,
pub vdev_id: u64, pub vdev_id: u64,
@@ -55,8 +57,8 @@ impl fmt::Debug for NvA082CtrlCmdHostVgpuDeviceGetVgpuTypeInfoParams {
.field("vgpu_name", &CStrFormat(&self.vgpu_name)) .field("vgpu_name", &CStrFormat(&self.vgpu_name))
.field("vgpu_class", &CStrFormat(&self.vgpu_class)) .field("vgpu_class", &CStrFormat(&self.vgpu_class))
.field("vgpu_signature", &HexFormatSlice(vgpu_signature)) .field("vgpu_signature", &HexFormatSlice(vgpu_signature))
.field("features", &CStrFormat(&self.features)) .field("license", &CStrFormat(&self.license))
.field("max_instances", &self.max_instances) .field("max_instance", &self.max_instance)
.field("num_heads", &self.num_heads) .field("num_heads", &self.num_heads)
.field("max_resolution_x", &self.max_resolution_x) .field("max_resolution_x", &self.max_resolution_x)
.field("max_resolution_y", &self.max_resolution_y) .field("max_resolution_y", &self.max_resolution_y)