Skip to content
Closed
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
341cd38
arm64: dts: apple: share the T604x SoC and PMGR description
astaff Oct 28, 2026
b805376
arm64: dts: apple: add the T6041 J616c board
astaff Oct 28, 2026
553968e
drm/asahi: share T604x register-window constructors
astaff Oct 28, 2026
3ae8de4
drm/asahi: add T6041 and the measured 25F84 firmware profile
astaff Oct 28, 2026
91f4fbe
drm/asahi: isolate 25F84 recovery and serial-render workarounds
astaff Oct 28, 2026
f3492cd
drm/apple: support T6041 desktop 26.5.2 DCP firmware
astaff Oct 28, 2026
3ca17e7
drm/apple: wait for flip completion before retiring a commit
astaff Oct 28, 2026
3db1129
soc: apple: use explicit word access for T6041 AOP bootargs
astaff Oct 28, 2026
285fe12
ASoC: apple: add protected J616c AOP audio
astaff Oct 28, 2026
5f7fc7b
media: apple: avd: admit qualified HEVC on J616c
astaff Oct 28, 2026
1ee7691
watchdog: apple: set ownership and honour nowayout
astaff Oct 28, 2026
fc821a8
tools: check T6041 initialization data against explicit captures
astaff Oct 28, 2026
edbddfe
arm64: dts: apple: preserve T604x CPU order for m1n1
astaff Oct 28, 2026
0a8b40a
drm/asahi: g17: size clustering metadata for four clusters
AxxzyWasTaken Oct 30, 2026
ddae96a
arm64: dts: apple: share the T604x SoC and PMGR description
astaff Nov 3, 2026
d22035c
arm64: dts: apple: add the T6041 J616c board
astaff Oct 28, 2026
dc14392
drm/asahi: share T604x register-window constructors
astaff Oct 28, 2026
e7c66a2
drm/asahi: add T6041 and the measured 25F84 firmware profile
astaff Oct 28, 2026
c33ca7f
drm/asahi: isolate 25F84 recovery and serial-render workarounds
astaff Oct 28, 2026
154d094
drm/apple: support T6041 desktop 26.5.2 DCP firmware
astaff Oct 28, 2026
944b0c1
drm/apple: wait for flip completion before retiring a commit
astaff Oct 28, 2026
3316b0c
soc: apple: use explicit word access for T6041 AOP bootargs
astaff Oct 28, 2026
fe0a495
ASoC: apple: add protected J616c AOP audio
astaff Oct 28, 2026
e61c35d
media: apple: avd: admit qualified HEVC on J616c
astaff Nov 3, 2026
6f8cd13
watchdog: apple: set ownership and honour nowayout
astaff Oct 28, 2026
c70ad57
tools: check T6041 initialization data against explicit captures
astaff Oct 28, 2026
90d6488
arm64: dts: apple: preserve T604x CPU order for m1n1
astaff Oct 28, 2026
84612a4
drm/asahi: scope experimental TA mode 1 to T6041 25F84
astaff Nov 3, 2026
a2fb3a1
Merge t6041/j616c-gpu-audio-video-20261027 into j616c/g17-four-cluste…
AxxzyWasTaken Nov 4, 2026
a5a5604
Merge t6041/j616c-gpu-audio-video-20261027 into j616c/g17-four-cluste…
AxxzyWasTaken Nov 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions drivers/gpu/drm/asahi/g17/buffer/target.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ const GTP_FIXED_SIZES: [usize; 4] = [0xc00, 0xa00, GTP6_SIZE, 0x80];
const GTP_SLOTS: usize = 64;
const GTP6_SIZE: usize = GTP_SLOTS
* (((cfg::TVB_MAX_BLOCKS * cfg::TVB_BLOCK_SIZE).div_ceil(0x8000) + 0x17ff) / 24 * 8 + 8);
/// Clustering metadata 2-4 (0x1c948, 0x1c888, 0x16c41/0x1ca40) on GPUs with more than two
/// clusters, at the sizes the M2 Pro/Max path gives them (`hw/t602x.rs` clustering config).
/// Metadata 1 (0x1c920) is sized per target there: [`META1_BLOCK_SIZE`] per block of tiles.
const GTP_MULTI_CLUSTER_SIZES: [usize; 3] = [0xc0 * 16, 0x280 * 16, 0x10 * 128];
const META1_BLOCK_SIZE: usize = 0x44;

/// Per-command geometry, independent of the capacity already allocated.
#[derive(Copy, Clone, Debug)]
Expand Down Expand Up @@ -113,15 +118,38 @@ impl Layout {
let mut gtp = [None; 8];
let mut tpc_end = tpc_size;
if programs == RegisterPrograms::V25G83 {
// The fixed sizes are the two-cluster M4 Pro's. With four clusters (M4 Max) clustered
// tiling outgrows them: the firmware then never starts a heavy render and kills it as
// no-progress (reason 0). Size them as the M2 Pro/Max path does.
let [meta2, meta3, meta4, meta1] = if clusters > 2 {
let meta1_blocks = aligned(tiles_x, 2)?
.checked_mul(aligned(tiles_y, 4)?)
.and_then(|v| v.checked_mul(utiles))
.ok_or(EOVERFLOW)?
.div_ceil(0x1980);
[
GTP_MULTI_CLUSTER_SIZES[0],
GTP_MULTI_CLUSTER_SIZES[1],
// Partial renders need the larger size here too.
GTP_MULTI_CLUSTER_SIZES[2].max(GTP6_SIZE),
aligned(
meta1_blocks.checked_mul(META1_BLOCK_SIZE).ok_or(EOVERFLOW)?,
0x80,
)?
.max(GTP_FIXED_SIZES[3]),
]
} else {
GTP_FIXED_SIZES
};
let sizes = [
tpc_size,
tilemap_size.checked_mul(64).ok_or(EOVERFLOW)?,
if layers > 1 { 0x4000 } else { 0 },
0,
GTP_FIXED_SIZES[0],
GTP_FIXED_SIZES[1],
GTP_FIXED_SIZES[2],
GTP_FIXED_SIZES[3],
meta2,
meta3,
meta4,
meta1,
];
let mut position = 0;
for ((offset, size), alignment) in gtp.iter_mut().zip(sizes).zip(GTP_ALIGNMENTS) {
Expand Down