diff --git a/drivers/gpu/drm/asahi/fw/compute.rs b/drivers/gpu/drm/asahi/fw/compute.rs index e29935d9bc5f35..860b9034bfb44c 100644 --- a/drivers/gpu/drm/asahi/fw/compute.rs +++ b/drivers/gpu/drm/asahi/fw/compute.rs @@ -24,7 +24,7 @@ pub(crate) mod raw { pub(crate) helper_program: u32, pub(crate) unk_44: u32, pub(crate) helper_arg: U64, - pub(crate) helper_unk: u32, + pub(crate) helper_cfg: u32, pub(crate) unk_54: u32, pub(crate) unk_58: u32, pub(crate) unk_5c: u32, diff --git a/drivers/gpu/drm/asahi/fw/fragment.rs b/drivers/gpu/drm/asahi/fw/fragment.rs index 586f3414a02957..cba69b967f5957 100644 --- a/drivers/gpu/drm/asahi/fw/fragment.rs +++ b/drivers/gpu/drm/asahi/fw/fragment.rs @@ -141,7 +141,7 @@ pub(crate) mod raw { pub(crate) isp_bgobjvals: u32, pub(crate) unk_38: u32, pub(crate) unk_3c: u32, - pub(crate) unk_40: u32, + pub(crate) helper_cfg: u32, pub(crate) __pad: Pad<0xac>, } diff --git a/drivers/gpu/drm/asahi/fw/vertex.rs b/drivers/gpu/drm/asahi/fw/vertex.rs index 1b2e3d978018ce..77f4b7eda11e01 100644 --- a/drivers/gpu/drm/asahi/fw/vertex.rs +++ b/drivers/gpu/drm/asahi/fw/vertex.rs @@ -25,7 +25,8 @@ pub(crate) mod raw { pub(crate) tpc_stride: u32, pub(crate) unk_24: u32, pub(crate) unk_28: u32, - pub(crate) __pad: Pad<0x74>, + pub(crate) helper_cfg: u32, + pub(crate) __pad: Pad<0x70>, } #[versions(AGX)] diff --git a/drivers/gpu/drm/asahi/queue/compute.rs b/drivers/gpu/drm/asahi/queue/compute.rs index fb23dc34567366..99bc484920d8e9 100644 --- a/drivers/gpu/drm/asahi/queue/compute.rs +++ b/drivers/gpu/drm/asahi/queue/compute.rs @@ -279,7 +279,7 @@ impl super::Queue::ver { helper_program: cmdbuf.helper_program, // Internal program addr | 1 unk_44: 0, helper_arg: U64(cmdbuf.helper_arg), // Only if internal program used - helper_unk: cmdbuf.helper_unk, // 0x40 if internal program used + helper_cfg: cmdbuf.helper_cfg, // 0x40 if internal program used unk_54: 0, unk_58: 1, unk_5c: 0, diff --git a/drivers/gpu/drm/asahi/queue/render.rs b/drivers/gpu/drm/asahi/queue/render.rs index cb61aa5a95cf84..92663cae6914a7 100644 --- a/drivers/gpu/drm/asahi/queue/render.rs +++ b/drivers/gpu/drm/asahi/queue/render.rs @@ -200,6 +200,7 @@ impl super::Queue::ver { } else { 0x8000 }, + helper_cfg: cmdbuf.vertex_helper_cfg, __pad: Default::default(), }, }) @@ -862,7 +863,7 @@ impl super::Queue::ver { isp_bgobjvals: unks.load_bgobjvals as u32, unk_38: unks.frg_unk_38 as u32, unk_3c: unks.frg_unk_3c as u32, - unk_40: unks.frg_unk_40 as u32, + helper_cfg: cmdbuf.fragment_helper_cfg, __pad: Default::default(), }), #[ver(G >= G14X)]