Move didt callbacks to register access block.
Signed-off-by: Lijo Lazar <[email protected]>
Reviewed-by: Hawking Zhang <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 ++-----
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ---
.../gpu/drm/amd/amdgpu/amdgpu_reg_access.c | 22 +++++++++++++++++++
.../gpu/drm/amd/amdgpu/amdgpu_reg_access.h | 3 +++
drivers/gpu/drm/amd/amdgpu/cik.c | 12 +++++-----
drivers/gpu/drm/amd/amdgpu/nv.c | 12 +++++-----
drivers/gpu/drm/amd/amdgpu/si.c | 2 --
drivers/gpu/drm/amd/amdgpu/soc15.c | 12 +++++-----
drivers/gpu/drm/amd/amdgpu/soc21.c | 12 +++++-----
drivers/gpu/drm/amd/amdgpu/soc24.c | 2 --
drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 2 --
drivers/gpu/drm/amd/amdgpu/vi.c | 12 +++++-----
13 files changed, 59 insertions(+), 47 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index b2b250308cb1..f312057494e6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -906,10 +906,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;
@@ -1322,8 +1318,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))
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index 75154c0a26a7..c628d9f85518 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -645,7 +645,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);
@@ -704,7 +704,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);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 649c79acbbd9..40d7f3b7cb2e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3861,8 +3861,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;
@@ -3912,7 +3910,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);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
index 1f5d6be9a0fd..c31c86bbf18a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
@@ -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.
*/
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
index 0d66a13c8d5c..239dbd6ef2f6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
@@ -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);
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 342a496b6020..90c9a2e1cf5b 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index d0bc2dcd3066..dd8a85679f8f 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index bbf352ce8a64..bf9ad3ce4c65 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c
b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 72b5cab002d8..b69e50b4a66a 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c
b/drivers/gpu/drm/amd/amdgpu/soc21.c
index ddf4c422905c..4048c8dfdd4b 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -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)
@@ -589,8 +589,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;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc24.c
b/drivers/gpu/drm/amd/amdgpu/soc24.c
index d4f3df165090..11e0264617d8 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc24.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc24.c
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
b/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
index 6439b09656bf..0be52dba6a26 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 7d3b331d9217..9a0856a601c0 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -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;
--
2.49.0
