drm/amdgpu/discovery: move common discovery code out of navi1*_reg_base_init()

move amdgpu_discovery_reg_base_init() from navi1*_reg_base_init() to a
common function nv_reg_base_init().

Signed-off-by: Xiaojie Yuan <xiaojie.yuan@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/navi10_reg_init.c b/drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c
index 55014ce..a56c936 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c
@@ -29,20 +29,8 @@
 
 int navi10_reg_base_init(struct amdgpu_device *adev)
 {
-       int r, i;
+       int i;
 
-       if (amdgpu_discovery) {
-               r = amdgpu_discovery_reg_base_init(adev);
-               if (r) {
-                       DRM_WARN("failed to init reg base from ip discovery table, "
-                                       "fallback to legacy init method\n");
-                       goto legacy_init;
-               }
-
-               return 0;
-       }
-
-legacy_init:
        for (i = 0 ; i < MAX_INSTANCE ; ++i) {
                adev->reg_offset[GC_HWIP][i] = (uint32_t *)(&(GC_BASE.instance[i]));
                adev->reg_offset[HDP_HWIP][i] = (uint32_t *)(&(HDP_BASE.instance[i]));

diff --git a/drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c b/drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c
index 864668a..3b5f0f6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c
@@ -29,20 +29,8 @@
 
 int navi14_reg_base_init(struct amdgpu_device *adev)
 {
-       int r, i;
+       int i;
 
-       if (amdgpu_discovery) {
-               r = amdgpu_discovery_reg_base_init(adev);
-               if (r) {
-                       DRM_WARN("failed to init reg base from ip discovery table, "
-                                       "fallback to legacy init method\n");
-                       goto legacy_init;
-               }
-
-               return 0;
-       }
-
-legacy_init:
        for (i = 0 ; i < MAX_INSTANCE ; ++i) {
                adev->reg_offset[GC_HWIP][i] = (uint32_t *)(&(GC_BASE.instance[i]));
                adev->reg_offset[HDP_HWIP][i] = (uint32_t *)(&(HDP_BASE.instance[i]));

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index 2f09d87..3e67536 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -376,9 +376,22 @@ static const struct amdgpu_ip_block_version nv_common_ip_block =
        .funcs = &nv_common_ip_funcs,
 };
 
-int nv_set_ip_blocks(struct amdgpu_device *adev)
+static int nv_reg_base_init(struct amdgpu_device *adev)
 {
-       /* Set IP register base before any HW register access */
+       int r;
+
+       if (amdgpu_discovery) {
+               r = amdgpu_discovery_reg_base_init(adev);
+               if (r) {
+                       DRM_WARN("failed to init reg base from ip discovery table, "
+                                       "fallback to legacy init method\n");
+                       goto legacy_init;
+               }
+
+               return 0;
+       }
+
+legacy_init:
        switch (adev->asic_type) {
        case CHIP_NAVI10:
                navi10_reg_base_init(adev);
@@ -393,6 +406,18 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
                return -EINVAL;
        }
 
+       return 0;
+}
+
+int nv_set_ip_blocks(struct amdgpu_device *adev)
+{
+       int r;
+
+       /* Set IP register base before any HW register access */
+       r = nv_reg_base_init(adev);
+       if (r)
+               return r;
+
        adev->nbio_funcs = &nbio_v2_3_funcs;
 
        adev->nbio_funcs->detect_hw_virt(adev);