fixup! drm/asahi: Add the Asahi driver for Apple AGX GPUs

Author: hoshinolina

drivers/gpu/drm/asahi/driver.rs

@@ -131,13 +131,13 @@ impl platform::Driver for AsahiDriver {
             (hw::GpuGen::G14, hw::GpuVariant::G, &[12, 4, 0]) => {
                 gpu::GpuManagerG14V12_4::new(reg.device(), &res, cfg)? as Arc<dyn gpu::GpuManager>
             }
-            (hw::GpuGen::G13, _, &[13, 4, 99, 4]) => {
+            (hw::GpuGen::G13, _, &[13, 5, 0]) => {
                 gpu::GpuManagerG13V13_5::new(reg.device(), &res, cfg)? as Arc<dyn gpu::GpuManager>
             }
-            (hw::GpuGen::G14, hw::GpuVariant::G, &[13, 4, 99, 4]) => {
+            (hw::GpuGen::G14, hw::GpuVariant::G, &[13, 5, 0]) => {
                 gpu::GpuManagerG14V13_5::new(reg.device(), &res, cfg)? as Arc<dyn gpu::GpuManager>
             }
-            (hw::GpuGen::G14, _, &[13, 4, 99, 4]) => {
+            (hw::GpuGen::G14, _, &[13, 5, 0]) => {
                 gpu::GpuManagerG14XV13_5::new(reg.device(), &res, cfg)? as Arc<dyn gpu::GpuManager>
             }
             _ => {

drivers/gpu/drm/asahi/regs.rs

@@ -236,7 +236,7 @@ impl Resources {
                 core_mask_regs.try_push(self.sgx_read32(CORE_MASKS_G14X))?;
                 core_mask_regs.try_push(self.sgx_read32(CORE_MASKS_G14X + 4))?;
                 core_mask_regs.try_push(self.sgx_read32(CORE_MASKS_G14X + 8))?;
-                (id_clusters >> 28) & 0xf // TODO: guess
+                (id_counts_1 >> 8) & 0xff
             }
             a => {
                 dev_err!(self.dev, "Unknown GPU generation {}\n", a);