drm/amdgpu: abstract disable identity aperture for gfxhub/mmhub

Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
index 2bd9185cc55d706ebb242025a44d884a0186e804..3359b2c073492b2203f26dda2fb788b8da0cd07b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
@@ -175,6 +175,26 @@ static void gfxhub_v1_0_enable_system_domain(struct amdgpu_device *adev)
        WREG32(SOC15_REG_OFFSET(GC, 0, mmVM_CONTEXT0_CNTL), tmp);
 }
 
+static void gfxhub_v1_0_disable_identity_aperture(struct amdgpu_device *adev)
+{
+       WREG32(SOC15_REG_OFFSET(GC, 0,
+                               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32),
+              0XFFFFFFFF);
+       WREG32(SOC15_REG_OFFSET(GC, 0,
+               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32), 0x0000000F);
+
+       WREG32(SOC15_REG_OFFSET(GC, 0,
+               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32), 0);
+       WREG32(SOC15_REG_OFFSET(GC, 0,
+               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32), 0);
+
+       WREG32(SOC15_REG_OFFSET(GC, 0,
+               mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32), 0);
+       WREG32(SOC15_REG_OFFSET(GC, 0,
+               mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32), 0);
+
+}
+
 int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)
 {
        u32 tmp;
@@ -199,22 +219,7 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)
        gfxhub_v1_0_init_cache_regs(adev);
 
        gfxhub_v1_0_enable_system_domain(adev);
-
-       /* Disable identity aperture.*/
-       WREG32(SOC15_REG_OFFSET(GC, 0,
-               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32), 0XFFFFFFFF);
-       WREG32(SOC15_REG_OFFSET(GC, 0,
-               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32), 0x0000000F);
-
-       WREG32(SOC15_REG_OFFSET(GC, 0,
-               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32), 0);
-       WREG32(SOC15_REG_OFFSET(GC, 0,
-               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32), 0);
-
-       WREG32(SOC15_REG_OFFSET(GC, 0,
-               mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32), 0);
-       WREG32(SOC15_REG_OFFSET(GC, 0,
-               mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32), 0);
+       gfxhub_v1_0_disable_identity_aperture(adev);
 
        for (i = 0; i <= 14; i++) {
                tmp = RREG32(SOC15_REG_OFFSET(GC, 0, mmVM_CONTEXT1_CNTL) + i);

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
index 261416165fdf0a5353524899de1c6ff1e0066a7f..bd0542511327c80b4e901825db0c24ccbbee6486 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
@@ -186,6 +186,25 @@ static void mmhub_v1_0_enable_system_domain(struct amdgpu_device *adev)
        WREG32(SOC15_REG_OFFSET(MMHUB, 0, mmVM_CONTEXT0_CNTL), tmp);
 }
 
+static void mmhub_v1_0_disable_identity_aperture(struct amdgpu_device *adev)
+{
+       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
+                               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32),
+              0XFFFFFFFF);
+       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
+               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32), 0x0000000F);
+
+       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
+               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32), 0);
+       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
+               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32), 0);
+
+       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
+               mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32), 0);
+       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
+               mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32), 0);
+}
+
 int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)
 {
        u32 tmp;
@@ -210,22 +229,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)
        mmhub_v1_0_init_cache_regs(adev);
 
        mmhub_v1_0_enable_system_domain(adev);
-
-       /* Disable identity aperture.*/
-       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
-               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32), 0XFFFFFFFF);
-       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
-               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32), 0x0000000F);
-
-       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
-               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32), 0);
-       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
-               mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32), 0);
-
-       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
-               mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32), 0);
-       WREG32(SOC15_REG_OFFSET(MMHUB, 0,
-               mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32), 0);
+       mmhub_v1_0_disable_identity_aperture(adev);
 
        for (i = 0; i <= 14; i++) {
                tmp = RREG32(SOC15_REG_OFFSET(MMHUB, 0, mmVM_CONTEXT1_CNTL)