drm/amdgpu: switch to atomfirmware_asic_init

Some initial settings now are not available from
the atom data table. The assumption that !ps[0]
|| !ps[1] in amdgpu_atom_asic_init is not valid.
In addition, driver needs to strictly follow
atomfirmware structure (asic_init_parameters) to
initialize parameters used to execute asic_init
function, otherwise, the execution of asic_init
would fail.

This shall be applicable to all soc15 adapters,but
let make the transition on soc21 first.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@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 9485b6b9d4e624ddadb968b850e00de53367b538..53d938d5a00a06b6ce90e3526d4c0c1d48b27b39 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -913,7 +913,10 @@ static int amdgpu_device_asic_init(struct amdgpu_device *adev)
 {
        amdgpu_asic_pre_asic_init(adev);
 
-       return amdgpu_atom_asic_init(adev->mode_info.atom_context);
+       if (adev->ip_versions[GC_HWIP][0] >= IP_VERSION(11, 0, 0))
+               return amdgpu_atomfirmware_asic_init(adev, true);
+       else
+               return amdgpu_atom_asic_init(adev->mode_info.atom_context);
 }
 
 /**