From 0ebd7740cc0412b326e4c8558b79d7b517327173 Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Wed, 9 Aug 2023 19:50:00 +0900 Subject: [PATCH] drm/asahi: hw/t602x: Increase meta/preempt sizes for G14D meta2,meta3 confirmed, meta4 conservative guess (it's small anyway). Not sure yet if max_splits also needs to be doubled. Compute preempt just conservatively doubled. Since that one is a bit larger, use the smaller size for <= G14C. Signed-off-by: Asahi Lina --- drivers/gpu/drm/asahi/hw/t602x.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/asahi/hw/t602x.rs b/drivers/gpu/drm/asahi/hw/t602x.rs index 8872d215f924ba..23efa413f85f6e 100644 --- a/drivers/gpu/drm/asahi/hw/t602x.rs +++ b/drivers/gpu/drm/asahi/hw/t602x.rs @@ -65,12 +65,12 @@ pub(crate) const HWCONFIG_T6022: super::HwConfig = HwConfig { preempt1_size: 0x540, preempt2_size: 0x280, preempt3_size: 0x40, - compute_preempt1_size: 0x25980, // CHECK for T6022 + compute_preempt1_size: 0x25980 * 2, // Conservative guess clustering: Some(HwClusteringConfig { meta1_blocksize: 0x44, - meta2_size: 0xc0 * 8, - meta3_size: 0x280 * 8, - meta4_size: 0x10 * 64, + meta2_size: 0xc0 * 16, + meta3_size: 0x280 * 16, + meta4_size: 0x10 * 128, max_splits: 64, }), @@ -155,6 +155,7 @@ pub(crate) const HWCONFIG_T6021: super::HwConfig = HwConfig { num_dies: 1, max_num_clusters: 4, + compute_preempt1_size: 0x25980, unk_hws2_4: Some(f32!([1.0, 0.8, 0.2, 0.9, 0.1, 0.25, 0.7, 0.9])), fast_sensor_mask: [0x40005000c000d00, 0], fast_sensor_mask_alt: [0x140015001d001d00, 0],