drm/amdgpu: add to set navi ip blocks

Set the IPs for navi10 in early_init like other asics.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 16fd5da..2ec5728 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -51,6 +51,7 @@
 #endif
 #include "vi.h"
 #include "soc15.h"
+#include "nv.h"
 #include "bif/bif_4_1_d.h"
 #include <linux/pci.h>
 #include <linux/firmware.h>
@@ -1528,6 +1529,13 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
                if (r)
                        return r;
                break;
+       case  CHIP_NAVI10:
+               adev->family = AMDGPU_FAMILY_NV;
+
+               r = nv_set_ip_blocks(adev);
+               if (r)
+                       return r;
+               break;
        default:
                /* FIXME: not supported yet */
                return -EINVAL;