aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
diff options
context:
space:
mode:
authorHuang Rui <ray.huang@amd.com>2016-11-01 03:35:38 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-03-29 23:54:33 -0400
commite635ee07456ac686b3c26ab3c5735936faebfb2e (patch)
tree7bca30692c4879c9436134ab3fad8a27b6c0f09d /drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
parent70170d146d0f8d6df6c1edafa70cf983027f7a6e (diff)
drm/amdgpu: use new flag to handle different firmware loading method
This patch introduces a new flag named "amdgpu_firmware_load_type" to handle different firmware loading method. Since Vega10, there are three ways to load firmware. It would be better to use a flag and a fw_load_type kernel parameter to configure it. Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Huang Rui <ray.huang@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index d56d200a3646..96a5113b948f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -163,7 +163,7 @@ static int amdgpu_pp_hw_init(void *handle)
163 int ret = 0; 163 int ret = 0;
164 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 164 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
165 165
166 if (adev->pp_enabled && adev->firmware.smu_load) 166 if (adev->pp_enabled && adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)
167 amdgpu_ucode_init_bo(adev); 167 amdgpu_ucode_init_bo(adev);
168 168
169 if (adev->powerplay.ip_funcs->hw_init) 169 if (adev->powerplay.ip_funcs->hw_init)
@@ -190,7 +190,7 @@ static int amdgpu_pp_hw_fini(void *handle)
190 ret = adev->powerplay.ip_funcs->hw_fini( 190 ret = adev->powerplay.ip_funcs->hw_fini(
191 adev->powerplay.pp_handle); 191 adev->powerplay.pp_handle);
192 192
193 if (adev->pp_enabled && adev->firmware.smu_load) 193 if (adev->pp_enabled && adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)
194 amdgpu_ucode_fini_bo(adev); 194 amdgpu_ucode_fini_bo(adev);
195 195
196 return ret; 196 return ret;