Skip to content

Commit 5501e97

Browse files
asahilinaherrnst
authored andcommitted
drm/asahi: hw: Drop max_dies
This isn't available on t602x, so it was probably a bad guess. Just use the known die count for the userspace info, from our HW info tables. Signed-off-by: Asahi Lina <[email protected]>
1 parent b023612 commit 5501e97

File tree

4 files changed

+1
-5
lines changed

4 files changed

+1
-5
lines changed

drivers/gpu/drm/asahi/file.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ impl File {
218218
gpu_revision: gpu.get_dyncfg().id.gpu_rev as u32,
219219
chip_id: gpu.get_cfg().chip_id,
220220

221-
num_dies: gpu.get_dyncfg().id.max_dies,
221+
num_dies: gpu.get_cfg().num_dies,
222222
num_clusters_total: gpu.get_dyncfg().id.num_clusters,
223223
num_cores_per_cluster: gpu.get_dyncfg().id.num_cores,
224224
num_frags_per_cluster: gpu.get_dyncfg().id.num_frags,

drivers/gpu/drm/asahi/gpu.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,6 @@ impl GpuManager::ver {
684684
gpu_id.gpu_gen,
685685
gpu_id.gpu_variant
686686
);
687-
dev_info!(dev, " Max dies: {}\n", gpu_id.max_dies);
688687
dev_info!(dev, " Clusters: {}\n", gpu_id.num_clusters);
689688
dev_info!(
690689
dev,

drivers/gpu/drm/asahi/hw/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,6 @@ pub(crate) struct GpuIdConfig {
328328
pub(crate) gpu_rev: GpuRevision,
329329
/// GPU silicon revision ID (firmware enum).
330330
pub(crate) gpu_rev_id: GpuRevisionID,
331-
/// Maximum number of dies supported.
332-
pub(crate) max_dies: u32,
333331
/// Total number of GPU clusters.
334332
pub(crate) num_clusters: u32,
335333
/// Maximum number of GPU cores per cluster.

drivers/gpu/drm/asahi/regs.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ impl Resources {
333333
},
334334
gpu_rev,
335335
gpu_rev_id,
336-
max_dies: (id_clusters >> 20) & 0xf,
337336
num_clusters,
338337
num_cores,
339338
num_frags: num_cores, // Used to be id_counts_1[15:8] but does not work for G14X

0 commit comments

Comments
 (0)