fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nil: Add new GOBTypes for blackwell+

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35660>
This commit is contained in:
Faith Ekstrand 2025-06-20 17:27:20 -04:00 • committed by Marge Bot
parent 76e72d63f0
commit 9981227dae
3 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/nouveau/headers/meson.build
View file

@ -27,6 +27,7 @@ nv_classes = [
'clc6c0',
'clc797',
'clc7c0',
'clcd97',
'clcbc0',
'clcdc0',
'clcec0',

3
src/nouveau/nil/modifiers.rs
View file

@ -67,6 +67,9 @@ impl GOBType {
panic!("Modifiers are not supported for Z/S images");
}
GOBType::TuringColor2D => GOBKindVersion::Turing,
GOBType::Blackwell8Bit | GOBType::Blackwell16Bit => {
todo!("We need new modifiers for Blackwell+")
}
}
}

28
src/nouveau/nil/tiling.rs
View file

@ -9,7 +9,7 @@ use crate::image::{
};
use crate::ILog2Ceil;
use nvidia_headers::classes::{cl9097, clc597};
use nvidia_headers::classes::{cl9097, clc597, clcd97};
#[repr(u8)]
#[derive(Clone, Copy, Debug, Default, PartialEq)]
@ -26,6 +26,12 @@ pub enum GOBType {
/// The Turing 2D GOB format for color images
TuringColor2D,
/// The Blackwell+ GOB format for 8bit images
Blackwell8Bit,
/// The Blackwell+ GOB format for 16bit images
Blackwell16Bit,
}
impl GOBType {
@ -33,7 +39,17 @@ impl GOBType {
dev: &nil_rs_bindings::nv_device_info,
format: Format,
) -> GOBType {
if dev.cls_eng3d >= clc597::TURING_A {
if dev.cls_eng3d >= clcd97::BLACKWELL_A {
if format.is_depth_or_stencil() {
GOBType::TuringZS
} else {
match format.el_size_B() {
1 => GOBType::Blackwell8Bit,
2 => GOBType::Blackwell16Bit,
_ => GOBType::TuringColor2D,
}
}
} else if dev.cls_eng3d >= clc597::TURING_A {
if format.is_depth_or_stencil() {
GOBType::TuringZS
} else {
@ -49,9 +65,11 @@ impl GOBType {
pub fn extent_B(&self) -> Extent4D<units::Bytes> {
match self {
GOBType::Linear => Extent4D::new(1, 1, 1, 1),
GOBType::Fermi | GOBType::TuringZS | GOBType::TuringColor2D => {
Extent4D::new(64, 8, 1, 1)
}
GOBType::Fermi
| GOBType::TuringZS
| GOBType::TuringColor2D
| GOBType::Blackwell8Bit
| GOBType::Blackwell16Bit => Extent4D::new(64, 8, 1, 1),
}
}