Commit 19aede77 authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu: move firmware loading type setup to common code

No need to replicate it in several places.
Reviewed-by: default avatarRex Zhu <rezhu@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a9f36360
...@@ -856,6 +856,8 @@ static void amdgpu_device_check_arguments(struct amdgpu_device *adev) ...@@ -856,6 +856,8 @@ static void amdgpu_device_check_arguments(struct amdgpu_device *adev)
dev_warn(adev->dev, "lockup_timeout msut be > 0, adjusting to 10000\n"); dev_warn(adev->dev, "lockup_timeout msut be > 0, adjusting to 10000\n");
amdgpu_lockup_timeout = 10000; amdgpu_lockup_timeout = 10000;
} }
adev->firmware.load_type = amdgpu_ucode_get_load_type(adev, amdgpu_fw_load_type);
} }
/** /**
......
...@@ -1887,8 +1887,6 @@ static int cik_common_early_init(void *handle) ...@@ -1887,8 +1887,6 @@ static int cik_common_early_init(void *handle)
return -EINVAL; return -EINVAL;
} }
adev->firmware.load_type = amdgpu_ucode_get_load_type(adev, amdgpu_fw_load_type);
amdgpu_device_get_pcie_info(adev); amdgpu_device_get_pcie_info(adev);
return 0; return 0;
......
...@@ -692,8 +692,6 @@ static int soc15_common_early_init(void *handle) ...@@ -692,8 +692,6 @@ static int soc15_common_early_init(void *handle)
xgpu_ai_mailbox_set_irq_funcs(adev); xgpu_ai_mailbox_set_irq_funcs(adev);
} }
adev->firmware.load_type = amdgpu_ucode_get_load_type(adev, amdgpu_fw_load_type);
amdgpu_device_get_pcie_info(adev); amdgpu_device_get_pcie_info(adev);
return 0; return 0;
......
...@@ -1097,9 +1097,6 @@ static int vi_common_early_init(void *handle) ...@@ -1097,9 +1097,6 @@ static int vi_common_early_init(void *handle)
xgpu_vi_mailbox_set_irq_funcs(adev); xgpu_vi_mailbox_set_irq_funcs(adev);
} }
/* vi use smc load by default */
adev->firmware.load_type = amdgpu_ucode_get_load_type(adev, amdgpu_fw_load_type);
amdgpu_device_get_pcie_info(adev); amdgpu_device_get_pcie_info(adev);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment