]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/amdgpu: Add didt method to register block
authorLijo Lazar <lijo.lazar@amd.com>
Mon, 8 Dec 2025 13:22:42 +0000 (18:52 +0530)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 2 Mar 2026 21:46:03 +0000 (16:46 -0500)
Move didt callbacks to register access block.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
13 files changed:
drivers/gpu/drm/amd/amdgpu/amdgpu.h
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
drivers/gpu/drm/amd/amdgpu/cik.c
drivers/gpu/drm/amd/amdgpu/nv.c
drivers/gpu/drm/amd/amdgpu/si.c
drivers/gpu/drm/amd/amdgpu/soc15.c
drivers/gpu/drm/amd/amdgpu/soc21.c
drivers/gpu/drm/amd/amdgpu/soc24.c
drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
drivers/gpu/drm/amd/amdgpu/vi.c

index f373078d4885cb3e5ece7c5e16b1128e7c572e1d..d1ec5143d3016f3516e5da2a7b11f844797078ef 100644 (file)
@@ -914,10 +914,6 @@ struct amdgpu_device {
        amdgpu_wreg64_t                 pcie_wreg64;
        amdgpu_rreg64_ext_t                     pcie_rreg64_ext;
        amdgpu_wreg64_ext_t pcie_wreg64_ext;
-       /* protects concurrent DIDT register access */
-       spinlock_t didt_idx_lock;
-       amdgpu_rreg_t                   didt_rreg;
-       amdgpu_wreg_t                   didt_wreg;
        /* protects concurrent gc_cac register access */
        spinlock_t gc_cac_idx_lock;
        amdgpu_rreg_t                   gc_cac_rreg;
@@ -1338,8 +1334,8 @@ int emu_soc_asic_init(struct amdgpu_device *adev);
 #define WREG32_SMC(reg, v) amdgpu_reg_smc_wr32(adev, (reg), (v))
 #define RREG32_UVD_CTX(reg) amdgpu_reg_uvd_ctx_rd32(adev, (reg))
 #define WREG32_UVD_CTX(reg, v) amdgpu_reg_uvd_ctx_wr32(adev, (reg), (v))
-#define RREG32_DIDT(reg) adev->didt_rreg(adev, (reg))
-#define WREG32_DIDT(reg, v) adev->didt_wreg(adev, (reg), (v))
+#define RREG32_DIDT(reg) amdgpu_reg_didt_rd32(adev, (reg))
+#define WREG32_DIDT(reg, v) amdgpu_reg_didt_wr32(adev, (reg), (v))
 #define RREG32_GC_CAC(reg) adev->gc_cac_rreg(adev, (reg))
 #define WREG32_GC_CAC(reg, v) adev->gc_cac_wreg(adev, (reg), (v))
 #define RREG32_SE_CAC(reg) adev->se_cac_rreg(adev, (reg))
index 9b751138c418bb4d9a63677e0815c1f1e0ab2718..b42f866935ab27f24c4a71a8921c755ec531c9fd 100644 (file)
@@ -638,7 +638,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,
        if (size & 0x3 || *pos & 0x3)
                return -EINVAL;
 
-       if (!adev->didt_rreg)
+       if (!adev->reg.didt.rreg)
                return -EOPNOTSUPP;
 
        r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
@@ -696,7 +696,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user
        if (size & 0x3 || *pos & 0x3)
                return -EINVAL;
 
-       if (!adev->didt_wreg)
+       if (!adev->reg.didt.wreg)
                return -EOPNOTSUPP;
 
        r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
index d5f92aeab94cb06278bd2ae1efdff666787fe42e..e04bcc42b292dc7b02df5d758438bfe248e71f35 100644 (file)
@@ -3842,8 +3842,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
        adev->pcie_wreg64 = &amdgpu_invalid_wreg64;
        adev->pcie_rreg64_ext = &amdgpu_invalid_rreg64_ext;
        adev->pcie_wreg64_ext = &amdgpu_invalid_wreg64_ext;
-       adev->didt_rreg = &amdgpu_invalid_rreg;
-       adev->didt_wreg = &amdgpu_invalid_wreg;
        adev->gc_cac_rreg = &amdgpu_invalid_rreg;
        adev->gc_cac_wreg = &amdgpu_invalid_wreg;
        adev->audio_endpt_rreg = &amdgpu_block_invalid_rreg;
@@ -3893,7 +3891,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
 
        spin_lock_init(&adev->mmio_idx_lock);
        spin_lock_init(&adev->pcie_idx_lock);
-       spin_lock_init(&adev->didt_idx_lock);
        spin_lock_init(&adev->gc_cac_idx_lock);
        spin_lock_init(&adev->se_cac_idx_lock);
        spin_lock_init(&adev->audio_endpt_idx_lock);
index 1f5d6be9a0fde3350ac480ba7caadc662eaf9709..c31c86bbf18abc1cd075839fb5e143dd29bf3534 100644 (file)
@@ -42,6 +42,10 @@ void amdgpu_reg_access_init(struct amdgpu_device *adev)
        spin_lock_init(&adev->reg.uvd_ctx.lock);
        adev->reg.uvd_ctx.rreg = NULL;
        adev->reg.uvd_ctx.wreg = NULL;
+
+       spin_lock_init(&adev->reg.didt.lock);
+       adev->reg.didt.rreg = NULL;
+       adev->reg.didt.wreg = NULL;
 }
 
 uint32_t amdgpu_reg_smc_rd32(struct amdgpu_device *adev, uint32_t reg)
@@ -83,6 +87,24 @@ void amdgpu_reg_uvd_ctx_wr32(struct amdgpu_device *adev, uint32_t reg,
        adev->reg.uvd_ctx.wreg(adev, reg, v);
 }
 
+uint32_t amdgpu_reg_didt_rd32(struct amdgpu_device *adev, uint32_t reg)
+{
+       if (!adev->reg.didt.rreg) {
+               dev_err_once(adev->dev, "DIDT register read not supported\n");
+               return 0;
+       }
+       return adev->reg.didt.rreg(adev, reg);
+}
+
+void amdgpu_reg_didt_wr32(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
+{
+       if (!adev->reg.didt.wreg) {
+               dev_err_once(adev->dev, "DIDT register write not supported\n");
+               return;
+       }
+       adev->reg.didt.wreg(adev, reg, v);
+}
+
 /*
  * register access helper functions.
  */
index 0d66a13c8d5c2beae25e904187450333f395163d..239dbd6ef2f6ae595f602c71578b39de3bf8bdd1 100644 (file)
@@ -41,6 +41,7 @@ struct amdgpu_reg_ind {
 struct amdgpu_reg_access {
        struct amdgpu_reg_ind smc;
        struct amdgpu_reg_ind uvd_ctx;
+       struct amdgpu_reg_ind didt;
 };
 
 void amdgpu_reg_access_init(struct amdgpu_device *adev);
@@ -48,6 +49,8 @@ uint32_t amdgpu_reg_smc_rd32(struct amdgpu_device *adev, uint32_t reg);
 void amdgpu_reg_smc_wr32(struct amdgpu_device *adev, uint32_t reg, uint32_t v);
 uint32_t amdgpu_reg_uvd_ctx_rd32(struct amdgpu_device *adev, uint32_t reg);
 void amdgpu_reg_uvd_ctx_wr32(struct amdgpu_device *adev, uint32_t reg, uint32_t v);
+uint32_t amdgpu_reg_didt_rd32(struct amdgpu_device *adev, uint32_t reg);
+void amdgpu_reg_didt_wr32(struct amdgpu_device *adev, uint32_t reg, uint32_t v);
 
 typedef uint32_t (*amdgpu_rreg_ext_t)(struct amdgpu_device *, uint64_t);
 typedef void (*amdgpu_wreg_ext_t)(struct amdgpu_device *, uint64_t, uint32_t);
index 342a496b6020455fff5fb36fc12cdd9eb2417eac..90c9a2e1cf5b4828374c9dad8c13ea93a2f1238a 100644 (file)
@@ -223,10 +223,10 @@ static u32 cik_didt_rreg(struct amdgpu_device *adev, u32 reg)
        unsigned long flags;
        u32 r;
 
-       spin_lock_irqsave(&adev->didt_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.didt.lock, flags);
        WREG32(mmDIDT_IND_INDEX, (reg));
        r = RREG32(mmDIDT_IND_DATA);
-       spin_unlock_irqrestore(&adev->didt_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.didt.lock, flags);
        return r;
 }
 
@@ -234,10 +234,10 @@ static void cik_didt_wreg(struct amdgpu_device *adev, u32 reg, u32 v)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&adev->didt_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.didt.lock, flags);
        WREG32(mmDIDT_IND_INDEX, (reg));
        WREG32(mmDIDT_IND_DATA, (v));
-       spin_unlock_irqrestore(&adev->didt_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.didt.lock, flags);
 }
 
 static const u32 bonaire_golden_spm_registers[] =
@@ -1990,8 +1990,8 @@ static int cik_common_early_init(struct amdgpu_ip_block *ip_block)
        adev->pcie_wreg = &cik_pcie_wreg;
        adev->reg.uvd_ctx.rreg = &cik_uvd_ctx_rreg;
        adev->reg.uvd_ctx.wreg = &cik_uvd_ctx_wreg;
-       adev->didt_rreg = &cik_didt_rreg;
-       adev->didt_wreg = &cik_didt_wreg;
+       adev->reg.didt.rreg = &cik_didt_rreg;
+       adev->reg.didt.wreg = &cik_didt_wreg;
 
        adev->asic_funcs = &cik_asic_funcs;
 
index d0bc2dcd3066392be0960a829e4b011dcf294d68..dd8a85679f8f8b78422aa494337fc8df0cf6101e 100644 (file)
@@ -283,10 +283,10 @@ static u32 nv_didt_rreg(struct amdgpu_device *adev, u32 reg)
        address = SOC15_REG_OFFSET(GC, 0, mmDIDT_IND_INDEX);
        data = SOC15_REG_OFFSET(GC, 0, mmDIDT_IND_DATA);
 
-       spin_lock_irqsave(&adev->didt_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.didt.lock, flags);
        WREG32(address, (reg));
        r = RREG32(data);
-       spin_unlock_irqrestore(&adev->didt_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.didt.lock, flags);
        return r;
 }
 
@@ -297,10 +297,10 @@ static void nv_didt_wreg(struct amdgpu_device *adev, u32 reg, u32 v)
        address = SOC15_REG_OFFSET(GC, 0, mmDIDT_IND_INDEX);
        data = SOC15_REG_OFFSET(GC, 0, mmDIDT_IND_DATA);
 
-       spin_lock_irqsave(&adev->didt_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.didt.lock, flags);
        WREG32(address, (reg));
        WREG32(data, (v));
-       spin_unlock_irqrestore(&adev->didt_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.didt.lock, flags);
 }
 
 static u32 nv_get_config_memsize(struct amdgpu_device *adev)
@@ -642,8 +642,8 @@ static int nv_common_early_init(struct amdgpu_ip_block *ip_block)
        adev->pciep_rreg = amdgpu_device_pcie_port_rreg;
        adev->pciep_wreg = amdgpu_device_pcie_port_wreg;
 
-       adev->didt_rreg = &nv_didt_rreg;
-       adev->didt_wreg = &nv_didt_wreg;
+       adev->reg.didt.rreg = &nv_didt_rreg;
+       adev->reg.didt.wreg = &nv_didt_wreg;
 
        adev->asic_funcs = &nv_asic_funcs;
 
index bbf352ce8a64d1f31323f4c74127e3f837421c63..bf9ad3ce4c65aa4e3363a8f2d8f9460844c38555 100644 (file)
@@ -2045,8 +2045,6 @@ static int si_common_early_init(struct amdgpu_ip_block *ip_block)
        adev->pciep_wreg = &si_pciep_wreg;
        adev->reg.uvd_ctx.rreg = &si_uvd_ctx_rreg;
        adev->reg.uvd_ctx.wreg = &si_uvd_ctx_wreg;
-       adev->didt_rreg = NULL;
-       adev->didt_wreg = NULL;
 
        adev->asic_funcs = &si_asic_funcs;
 
index 44bc1b71e39566c2a77308f5b59b8d82fdf84372..bf23b1d0fcc82d0d42be112a1d9d5eaf3bb11158 100644 (file)
@@ -273,10 +273,10 @@ static u32 soc15_didt_rreg(struct amdgpu_device *adev, u32 reg)
        address = SOC15_REG_OFFSET(GC, 0, mmDIDT_IND_INDEX);
        data = SOC15_REG_OFFSET(GC, 0, mmDIDT_IND_DATA);
 
-       spin_lock_irqsave(&adev->didt_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.didt.lock, flags);
        WREG32(address, (reg));
        r = RREG32(data);
-       spin_unlock_irqrestore(&adev->didt_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.didt.lock, flags);
        return r;
 }
 
@@ -287,10 +287,10 @@ static void soc15_didt_wreg(struct amdgpu_device *adev, u32 reg, u32 v)
        address = SOC15_REG_OFFSET(GC, 0, mmDIDT_IND_INDEX);
        data = SOC15_REG_OFFSET(GC, 0, mmDIDT_IND_DATA);
 
-       spin_lock_irqsave(&adev->didt_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.didt.lock, flags);
        WREG32(address, (reg));
        WREG32(data, (v));
-       spin_unlock_irqrestore(&adev->didt_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.didt.lock, flags);
 }
 
 static u32 soc15_gc_cac_rreg(struct amdgpu_device *adev, u32 reg)
@@ -971,8 +971,8 @@ static int soc15_common_early_init(struct amdgpu_ip_block *ip_block)
        adev->pcie_wreg64_ext = &amdgpu_device_indirect_wreg64_ext;
        adev->reg.uvd_ctx.rreg = &soc15_uvd_ctx_rreg;
        adev->reg.uvd_ctx.wreg = &soc15_uvd_ctx_wreg;
-       adev->didt_rreg = &soc15_didt_rreg;
-       adev->didt_wreg = &soc15_didt_wreg;
+       adev->reg.didt.rreg = &soc15_didt_rreg;
+       adev->reg.didt.wreg = &soc15_didt_wreg;
        adev->gc_cac_rreg = &soc15_gc_cac_rreg;
        adev->gc_cac_wreg = &soc15_gc_cac_wreg;
        adev->se_cac_rreg = &soc15_se_cac_rreg;
index 75ed71b1f2423b9f105aceacdf3936bff570c59d..8c5157439e9bb6f1534a77db4b22ac0abd88eb0f 100644 (file)
@@ -229,10 +229,10 @@ static u32 soc21_didt_rreg(struct amdgpu_device *adev, u32 reg)
        address = SOC15_REG_OFFSET(GC, 0, regDIDT_IND_INDEX);
        data = SOC15_REG_OFFSET(GC, 0, regDIDT_IND_DATA);
 
-       spin_lock_irqsave(&adev->didt_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.didt.lock, flags);
        WREG32(address, (reg));
        r = RREG32(data);
-       spin_unlock_irqrestore(&adev->didt_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.didt.lock, flags);
        return r;
 }
 
@@ -243,10 +243,10 @@ static void soc21_didt_wreg(struct amdgpu_device *adev, u32 reg, u32 v)
        address = SOC15_REG_OFFSET(GC, 0, regDIDT_IND_INDEX);
        data = SOC15_REG_OFFSET(GC, 0, regDIDT_IND_DATA);
 
-       spin_lock_irqsave(&adev->didt_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.didt.lock, flags);
        WREG32(address, (reg));
        WREG32(data, (v));
-       spin_unlock_irqrestore(&adev->didt_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.didt.lock, flags);
 }
 
 static u32 soc21_get_config_memsize(struct amdgpu_device *adev)
@@ -596,8 +596,8 @@ static int soc21_common_early_init(struct amdgpu_ip_block *ip_block)
        adev->pciep_rreg = amdgpu_device_pcie_port_rreg;
        adev->pciep_wreg = amdgpu_device_pcie_port_wreg;
 
-       adev->didt_rreg = &soc21_didt_rreg;
-       adev->didt_wreg = &soc21_didt_wreg;
+       adev->reg.didt.rreg = &soc21_didt_rreg;
+       adev->reg.didt.wreg = &soc21_didt_wreg;
 
        adev->asic_funcs = &soc21_asic_funcs;
 
index d4f3df165090c2c1581b3e488dcb5e73785f17ed..11e0264617d8f2f9daf04f822b946ba5cc4aeb66 100644 (file)
@@ -368,8 +368,6 @@ static int soc24_common_early_init(struct amdgpu_ip_block *ip_block)
        adev->pcie_wreg64 = &amdgpu_device_indirect_wreg64;
        adev->pciep_rreg = amdgpu_device_pcie_port_rreg;
        adev->pciep_wreg = amdgpu_device_pcie_port_wreg;
-       adev->didt_rreg = NULL;
-       adev->didt_wreg = NULL;
 
        adev->asic_funcs = &soc24_asic_funcs;
 
index 6439b09656bff246136c10a8af594292c4cd457a..0be52dba6a26d53299b25f8390fb1c55330e01cc 100644 (file)
@@ -260,8 +260,6 @@ static int soc_v1_0_common_early_init(struct amdgpu_ip_block *ip_block)
        adev->pciep_wreg = amdgpu_device_pcie_port_wreg;
        adev->pcie_rreg64_ext = &amdgpu_device_indirect_rreg64_ext;
        adev->pcie_wreg64_ext = &amdgpu_device_indirect_wreg64_ext;
-       adev->didt_rreg = NULL;
-       adev->didt_wreg = NULL;
 
        adev->asic_funcs = &soc_v1_0_asic_funcs;
 
index 7d3b331d9217d8d972ca708e8594fb148bfb335e..9a0856a601c06c98aa056f6fb9face46235da5a0 100644 (file)
@@ -394,10 +394,10 @@ static u32 vi_didt_rreg(struct amdgpu_device *adev, u32 reg)
        unsigned long flags;
        u32 r;
 
-       spin_lock_irqsave(&adev->didt_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.didt.lock, flags);
        WREG32(mmDIDT_IND_INDEX, (reg));
        r = RREG32(mmDIDT_IND_DATA);
-       spin_unlock_irqrestore(&adev->didt_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.didt.lock, flags);
        return r;
 }
 
@@ -405,10 +405,10 @@ static void vi_didt_wreg(struct amdgpu_device *adev, u32 reg, u32 v)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&adev->didt_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.didt.lock, flags);
        WREG32(mmDIDT_IND_INDEX, (reg));
        WREG32(mmDIDT_IND_DATA, (v));
-       spin_unlock_irqrestore(&adev->didt_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.didt.lock, flags);
 }
 
 static u32 vi_gc_cac_rreg(struct amdgpu_device *adev, u32 reg)
@@ -1464,8 +1464,8 @@ static int vi_common_early_init(struct amdgpu_ip_block *ip_block)
        adev->pcie_wreg = &vi_pcie_wreg;
        adev->reg.uvd_ctx.rreg = &vi_uvd_ctx_rreg;
        adev->reg.uvd_ctx.wreg = &vi_uvd_ctx_wreg;
-       adev->didt_rreg = &vi_didt_rreg;
-       adev->didt_wreg = &vi_didt_wreg;
+       adev->reg.didt.rreg = &vi_didt_rreg;
+       adev->reg.didt.wreg = &vi_didt_wreg;
        adev->gc_cac_rreg = &vi_gc_cac_rreg;
        adev->gc_cac_wreg = &vi_gc_cac_wreg;