drm/amdgpu: Add gc cac method to register block

Move gc cac access 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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index d1ec5143d3016f3516e5da2a7b11f844797078ef..469e5aeff61ab3bc736649598af10775fcbcf16d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -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 gc_cac register access */
-       spinlock_t gc_cac_idx_lock;
-       amdgpu_rreg_t                   gc_cac_rreg;
-       amdgpu_wreg_t                   gc_cac_wreg;
        /* protects concurrent se_cac register access */
        spinlock_t se_cac_idx_lock;
        amdgpu_rreg_t                   se_cac_rreg;
@@ -1336,8 +1332,8 @@ int emu_soc_asic_init(struct amdgpu_device *adev);
 #define WREG32_UVD_CTX(reg, v) amdgpu_reg_uvd_ctx_wr32(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_GC_CAC(reg) amdgpu_reg_gc_cac_rd32(adev, (reg))
+#define WREG32_GC_CAC(reg, v) amdgpu_reg_gc_cac_wr32(adev, (reg), (v))
 #define RREG32_SE_CAC(reg) adev->se_cac_rreg(adev, (reg))
 #define WREG32_SE_CAC(reg, v) adev->se_cac_wreg(adev, (reg), (v))
 #define RREG32_AUDIO_ENDPT(block, reg) adev->audio_endpt_rreg(adev, (block), (reg))

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index e04bcc42b292dc7b02df5d758438bfe248e71f35..0121dc12fd1f0903b54c2b40ec7d6910470c45b9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -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->gc_cac_rreg = &amdgpu_invalid_rreg;
-       adev->gc_cac_wreg = &amdgpu_invalid_wreg;
        adev->audio_endpt_rreg = &amdgpu_block_invalid_rreg;
        adev->audio_endpt_wreg = &amdgpu_block_invalid_wreg;
 
@@ -3891,7 +3889,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->gc_cac_idx_lock);
        spin_lock_init(&adev->se_cac_idx_lock);
        spin_lock_init(&adev->audio_endpt_idx_lock);
        spin_lock_init(&adev->mm_stats.lock);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
index c31c86bbf18abc1cd075839fb5e143dd29bf3534..69db9de507c55eee33f47ccb395906099556bbbd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c
@@ -46,6 +46,10 @@ void amdgpu_reg_access_init(struct amdgpu_device *adev)
        spin_lock_init(&adev->reg.didt.lock);
        adev->reg.didt.rreg = NULL;
        adev->reg.didt.wreg = NULL;
+
+       spin_lock_init(&adev->reg.gc_cac.lock);
+       adev->reg.gc_cac.rreg = NULL;
+       adev->reg.gc_cac.wreg = NULL;
 }
 
 uint32_t amdgpu_reg_smc_rd32(struct amdgpu_device *adev, uint32_t reg)
@@ -105,6 +109,26 @@ void amdgpu_reg_didt_wr32(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
        adev->reg.didt.wreg(adev, reg, v);
 }
 
+uint32_t amdgpu_reg_gc_cac_rd32(struct amdgpu_device *adev, uint32_t reg)
+{
+       if (!adev->reg.gc_cac.rreg) {
+               dev_err_once(adev->dev, "GC_CAC register read not supported\n");
+               return 0;
+       }
+       return adev->reg.gc_cac.rreg(adev, reg);
+}
+
+void amdgpu_reg_gc_cac_wr32(struct amdgpu_device *adev, uint32_t reg,
+                           uint32_t v)
+{
+       if (!adev->reg.gc_cac.wreg) {
+               dev_err_once(adev->dev,
+                            "GC_CAC register write not supported\n");
+               return;
+       }
+       adev->reg.gc_cac.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 239dbd6ef2f6ae595f602c71578b39de3bf8bdd1..3736fd5717713711738d9e731a6ff4c2c2b03403 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h
@@ -42,6 +42,7 @@ struct amdgpu_reg_access {
        struct amdgpu_reg_ind smc;
        struct amdgpu_reg_ind uvd_ctx;
        struct amdgpu_reg_ind didt;
+       struct amdgpu_reg_ind gc_cac;
 };
 
 void amdgpu_reg_access_init(struct amdgpu_device *adev);
@@ -51,6 +52,9 @@ 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);
+uint32_t amdgpu_reg_gc_cac_rd32(struct amdgpu_device *adev, uint32_t reg);
+void amdgpu_reg_gc_cac_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/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index bf23b1d0fcc82d0d42be112a1d9d5eaf3bb11158..3099a5e73e9340a31c35ddbe37f6520ca820dcf5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -298,10 +298,10 @@ static u32 soc15_gc_cac_rreg(struct amdgpu_device *adev, u32 reg)
        unsigned long flags;
        u32 r;
 
-       spin_lock_irqsave(&adev->gc_cac_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.gc_cac.lock, flags);
        WREG32_SOC15(GC, 0, mmGC_CAC_IND_INDEX, (reg));
        r = RREG32_SOC15(GC, 0, mmGC_CAC_IND_DATA);
-       spin_unlock_irqrestore(&adev->gc_cac_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.gc_cac.lock, flags);
        return r;
 }
 
@@ -309,10 +309,10 @@ static void soc15_gc_cac_wreg(struct amdgpu_device *adev, u32 reg, u32 v)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&adev->gc_cac_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.gc_cac.lock, flags);
        WREG32_SOC15(GC, 0, mmGC_CAC_IND_INDEX, (reg));
        WREG32_SOC15(GC, 0, mmGC_CAC_IND_DATA, (v));
-       spin_unlock_irqrestore(&adev->gc_cac_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.gc_cac.lock, flags);
 }
 
 static u32 soc15_se_cac_rreg(struct amdgpu_device *adev, u32 reg)
@@ -973,8 +973,8 @@ static int soc15_common_early_init(struct amdgpu_ip_block *ip_block)
        adev->reg.uvd_ctx.wreg = &soc15_uvd_ctx_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->reg.gc_cac.rreg = &soc15_gc_cac_rreg;
+       adev->reg.gc_cac.wreg = &soc15_gc_cac_wreg;
        adev->se_cac_rreg = &soc15_se_cac_rreg;
        adev->se_cac_wreg = &soc15_se_cac_wreg;
 

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 9a0856a601c06c98aa056f6fb9face46235da5a0..b8b6e1ea0d523d207b4a534b9ef0cd644f5b2926 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -416,10 +416,10 @@ static u32 vi_gc_cac_rreg(struct amdgpu_device *adev, u32 reg)
        unsigned long flags;
        u32 r;
 
-       spin_lock_irqsave(&adev->gc_cac_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.gc_cac.lock, flags);
        WREG32(mmGC_CAC_IND_INDEX, (reg));
        r = RREG32(mmGC_CAC_IND_DATA);
-       spin_unlock_irqrestore(&adev->gc_cac_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.gc_cac.lock, flags);
        return r;
 }
 
@@ -427,10 +427,10 @@ static void vi_gc_cac_wreg(struct amdgpu_device *adev, u32 reg, u32 v)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&adev->gc_cac_idx_lock, flags);
+       spin_lock_irqsave(&adev->reg.gc_cac.lock, flags);
        WREG32(mmGC_CAC_IND_INDEX, (reg));
        WREG32(mmGC_CAC_IND_DATA, (v));
-       spin_unlock_irqrestore(&adev->gc_cac_idx_lock, flags);
+       spin_unlock_irqrestore(&adev->reg.gc_cac.lock, flags);
 }
 
 
@@ -1466,8 +1466,8 @@ static int vi_common_early_init(struct amdgpu_ip_block *ip_block)
        adev->reg.uvd_ctx.wreg = &vi_uvd_ctx_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;
+       adev->reg.gc_cac.rreg = &vi_gc_cac_rreg;
+       adev->reg.gc_cac.wreg = &vi_gc_cac_wreg;
 
        adev->asic_funcs = &vi_asic_funcs;