drm/amdgpu: fix double ucode load by PSP(v3)
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix double ucode load by PSP(v3)
previously the ucode loading of PSP was repreated, one executed in phase_1 init/re-init/resume and the other in fw_loading routine
Avoid this double loading by clearing ip_blocks.status.hw in suspend or reset prior to the FW loading and any block's hw_init/resume
v2:
still do the smu fw loading since it is needed by bare-metal
v3:
drop the change in reinit_early_sriov, just clear all block's status.hw in the head place and set the status.hw after hw_init done is enough
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 59 +++++++++++++++++++----------- 1 file changed, 38 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +38 -21
@@ -1673,28 +1673,34 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev)if (adev->asic_type >=CHIP_VEGA10 ) {for (i =0 ; i < adev->num_ip_blocks; i++) { -if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_PSP ) { -if (adev->in_gpu_reset || adev->in_suspend) { -if (amdgpu_sriov_vf (adev) && adev->in_gpu_reset) -break ;/* sriov gpu reset, psp need to do hw_init before IH because of hw limit */ - r = adev->ip_blocks[i].version->funcs->resume (adev); -if (r) { -DRM_ERROR ("resume of IP block <%s> failed %d\n" , +if (adev->ip_blocks[i].version->type !=AMD_IP_BLOCK_TYPE_PSP ) +continue ; + +/* no need to do the fw loading again if already done*/ +if (adev->ip_blocks[i].status.hw == true) +break ; + +if (adev->in_gpu_reset || adev->in_suspend) { + r = adev->ip_blocks[i].version->funcs->resume (adev); +if (r) { +DRM_ERROR ("resume of IP block <%s> failed %d\n" , adev->ip_blocks[i].version->funcs->name, r); -return r; - } - }else { - r = adev->ip_blocks[i].version->funcs->hw_init (adev); -if (r) { -DRM_ERROR ("hw_init of IP block <%s> failed %d\n" , - adev->ip_blocks[i].version->funcs->name, r); -return r; - } +return r; + } + }else { + r = adev->ip_blocks[i].version->funcs->hw_init (adev); +if (r) { +DRM_ERROR ("hw_init of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r); +return r; } - adev->ip_blocks[i].status.hw = true; } + + adev->ip_blocks[i].status.hw = true; +break ; } } + r =amdgpu_pm_load_smu_firmware (adev, &smu_version);return r;
@@ -2136,7 +2142,9 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)if (r) {DRM_ERROR ("suspend of IP block <%s> failed %d\n" , adev->ip_blocks[i].version->funcs->name, r); +return r; } + adev->ip_blocks[i].status.hw = false; } }
@@ -2176,14 +2184,16 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)if (is_support_sw_smu (adev)) {/* todo */ }else if (adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->set_mp1_state) { + adev->powerplay.pp_funcs->set_mp1_state) { r = adev->powerplay.pp_funcs->set_mp1_state ( adev->powerplay.pp_handle, adev->mp1_state);if (r) {DRM_ERROR ("SMC failed to set mp1 state %d, %d\n" , adev->mp1_state, r); +return r; } + adev->ip_blocks[i].status.hw = false; } } }
@@ -2238,6 +2248,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev)for (j =0 ; j < adev->num_ip_blocks; j++) { block = &adev->ip_blocks[j]; + block->status.hw = false;if (block->version->type != ip_order[i] || !block->status.valid)continue ;
@@ -2246,6 +2257,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev)DRM_INFO ("RE-INIT-early: %s %s\n" , block->version->funcs->name, r?"failed" :"succeeded" );if (r)return r; + block->status.hw = true; } }
@@ -2273,13 +2285,15 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev) block = &adev->ip_blocks[j];if (block->version->type != ip_order[i] || - !block->status.valid) + !block->status.valid || + block->status.hw)continue ; r = block->version->funcs->hw_init (adev);DRM_INFO ("RE-INIT-late: %s %s\n" , block->version->funcs->name, r?"failed" :"succeeded" );if (r)return r; + block->status.hw = true; } }
@@ -2303,17 +2317,19 @@ static int amdgpu_device_ip_resume_phase1(struct amdgpu_device *adev)int i, r;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_blocks[i].status.valid) +if (!adev->ip_blocks[i].status.valid || adev->ip_blocks[i].status.hw)continue ;if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_COMMON || adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_GMC || adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_IH ) { + r = adev->ip_blocks[i].version->funcs->resume (adev);if (r) {DRM_ERROR ("resume of IP block <%s> failed %d\n" , adev->ip_blocks[i].version->funcs->name, r);return r; } + adev->ip_blocks[i].status.hw = true; } }
@@ -2338,7 +2354,7 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev)int i, r;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_blocks[i].status.valid) +if (!adev->ip_blocks[i].status.valid || adev->ip_blocks[i].status.hw)continue ; if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON || adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC ||
@@ -2351,6 +2367,7 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev) adev->ip_blocks[i].version->funcs->name, r);return r; } + adev->ip_blocks[i].status.hw = true; }return 0 ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1564563264-30902-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org
All looks good to me. Reviewed-by: Emily Deng <[email protected]>.
Quoted 224 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Monk Liu
Sent: Wednesday, July 31, 2019 4:54 PM
To: [email protected]
Cc: Liu, Monk <[email protected]>
Subject: [PATCH] drm/amdgpu: fix double ucode load by PSP(v3)previously the ucode loading of PSP was repreated, one executed in
phase_1init/re-init/resumeand the other infw_loadingroutineAvoid this double loading by clearing ip_blocks.status.hw in suspend or reset prior to the FW loading and any block's hw_init/resume
v2:
still do the smu fw loading since it is needed by bare-metalv3:
drop the change inreinit_early_sriov, just clear all block's status.hw in the head place and set the status.hw afterhw_initdone is enoughSigned-off-by Monk Liu <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c| 59
+++++++++++++++++++-----------1 file changed, 38 insertions(+), 21 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-4@@ -1673,28 +1673,34 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev)if (adev->asic_type >=CHIP_VEGA10 ) {for (i =0 ; i < adev->num_ip_blocks; i++) { -if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP) { -if (adev->in_gpu_reset || adev->in_suspend) { -if (amdgpu_sriov_vf (adev) && adev- >in_gpu_reset) -break ;/* sriov gpu reset, psp need to do
hw_initbefore IH because of hw limit */drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-1- r = adev->ip_blocks[i].version->funcs-Quoted 1 line
resume(adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-2-if (r) { - DRM_ERROR("resume of IPblock <%s> failed %d\n",
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+ if (adev->ip_blocks[i].version->type !=
AMD_IP_BLOCK_TYPE_PSP)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-0+continue ; + +/* no need to do the fw loading again if already done*/
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5
-0+if (adev->ip_blocks[i].status.hw == true) +break ; + +if (adev->in_gpu_reset || adev->in_suspend) { + r = adev->ip_blocks[i].version->funcs-Quoted 1 line
resume(adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+if (r) { + DRM_ERROR("resume of IP block <%s>failed %d\n",
adev-Quoted 1 line
ip_blocks[i].version->funcs->name, r);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-4-return r; - } - }else { - r = adev->ip_blocks[i].version->funcs-Quoted 1 line
hw_init(adev);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-2-if (r) { - DRM_ERROR("hw_init of IPblock <%s> failed %d\n",
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-1- adev->ip_blocks[i].version-Quoted 1 line
funcs->name, r);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-2-return r; - } +return r; + } + }else { + r = adev->ip_blocks[i].version->funcs-Quoted 1 line
hw_init(adev);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+if (r) { + DRM_ERROR("hw_init of IP block <%s>failed %d\n",
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+ adev-Quoted 1 line
ip_blocks[i].version->funcs->name, r);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+return r;}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-1- adev->ip_blocks[i].status.hw = true;}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-0+ + adev->ip_blocks[i].status.hw = true; +break ;} } + r = amdgpu_pm_load_smu_firmware(adev, &smu_version); return r;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0@@ -2136,7 +2142,9 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev) if (r) { DRM_ERROR("suspend of IP block <%s> failed %d\n", adev->ip_blocks[i].version->funcs- >name, r); +return r; } + adev->ip_blocks[i].status.hw = false;} }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1@@ -2176,14 +2184,16 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) if (is_support_sw_smu(adev)) {/* todo */ } else if (adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->set_mp1_state) { + adev->powerplay.pp_funcs- >set_mp1_state) { r = adev->powerplay.pp_funcs-Quoted 1 line
set_mp1_state(
adev->powerplay.pp_handle, adev->mp1_state); if (r) { DRM_ERROR("SMC failed to set mp1 state %d, %d\n", adev->mp1_state, r);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+return r;}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+ adev->ip_blocks[i].status.hw = false;} } }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0@@ -2238,6 +2248,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) for (j = 0; j < adev->num_ip_blocks; j++) { block = &adev->ip_blocks[j]; + block->status.hw = false;if (block->version->type != ip_order[i] || !block->status.valid)continue;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0@@ -2246,6 +2257,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) DRM_INFO("RE-INIT-early: %s %s\n", block->version- >funcs->name, r?"failed":"succeeded");if (r)return r; + block->status.hw = true; }}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-1@@ -2273,13 +2285,15 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev) block = &adev->ip_blocks[j];if (block->version->type != ip_order[i] || - !block->status.valid) + !block->status.valid || + block->status.hw)continue ; r = block->version->funcs->hw_init (adev);DRM_INFO ("RE-INIT-late: %s %s\n" , block->version- >funcs->name, r?"failed":"succeeded");if (r)return r; + block->status.hw = true; }}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1@@ -2303,17 +2317,19 @@ static int amdgpu_device_ip_resume_phase1(struct amdgpu_device *adev) int i, r;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_blocks[i].status.valid) +if (!adev->ip_blocks[i].status.valid || adev- >ip_blocks[i].status.hw)continue ; if (adev->ip_blocks[i].version->type ==
AMD_IP_BLOCK_TYPE_COMMON||adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC || adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH) { + r = adev->ip_blocks[i].version->funcs->resume(adev); if (r) { DRM_ERROR("resume of IP block <%s> failed %d\n", adev->ip_blocks[i].version->funcs-Quoted 1 line
name, r);
return r; }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+ adev->ip_blocks[i].status.hw = true;} }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1@@ -2338,7 +2354,7 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev)int i, r;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_blocks[i].status.valid) +if (!adev->ip_blocks[i].status.valid || adev- >ip_blocks[i].status.hw)continue ;if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON || adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC || @@ -2351,6 +2367,7 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev) adev->ip_blocks[i].version->funcs->name, r); return r; }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+ adev->ip_blocks[i].status.hw = true;} return 0;
Quoted 7 lines
--
2.7.4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): MN2PR12MB2975165B4F9C506815EDAC798FDF0-rweVpJHSKToFlvJWC7EAqwdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
If no objection I would submit those three patches, thanks
_____________________________________
Monk Liu|GPU Virtualization Team |AMD
-----Original Message-----
From: Deng, Emily <[email protected]>
Sent: Wednesday, July 31, 2019 5:04 PM
To: Liu, Monk <[email protected]>; [email protected]
Cc: Liu, Monk <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: fix double ucode load by PSP(v3)
All looks good to me. Reviewed-by: Emily Deng <[email protected]>.
Quoted 219 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Monk Liu
Sent: Wednesday, July 31, 2019 4:54 PM
To: [email protected]
Cc: Liu, Monk <[email protected]>
Subject: [PATCH] drm/amdgpu: fix double ucode load by PSP(v3)previously the ucode loading of PSP was repreated, one executed in
phase_1init/re-init/resumeand the other infw_loadingroutineAvoid this double loading by clearing ip_blocks.status.hw in suspend or reset prior to the FW loading and any block's hw_init/resume
v2:
still do the smu fw loading since it is needed by bare-metalv3:
drop the change inreinit_early_sriov, just clear all block's status.hw in the head place and set the status.hw afterhw_initdone is enoughSigned-off-by Monk Liu <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c| 59
+++++++++++++++++++-----------1 file changed, 38 insertions(+), 21 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-4@@ -1673,28 +1673,34 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev)if (adev->asic_type >=CHIP_VEGA10 ) {for (i =0 ; i < adev->num_ip_blocks; i++) { -if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP) { -if (adev->in_gpu_reset || adev->in_suspend) { -if (amdgpu_sriov_vf (adev) && adev- >in_gpu_reset) -break ;/* sriov gpu reset, psp need to do
hw_initbefore IH because of hw limit */drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-1- r = adev->ip_blocks[i].version->funcs-Quoted 1 line
resume(adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-2-if (r) { - DRM_ERROR("resume of IPblock <%s> failed %d\n",
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+ if (adev->ip_blocks[i].version->type !=
AMD_IP_BLOCK_TYPE_PSP)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-0+continue ; + +/* no need to do the fw loading again if already done*/
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5
-0+if (adev->ip_blocks[i].status.hw == true) +break ; + +if (adev->in_gpu_reset || adev->in_suspend) { + r = adev->ip_blocks[i].version->funcs-Quoted 1 line
resume(adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+if (r) { + DRM_ERROR("resume of IP block <%s>failed %d\n",
adev-Quoted 1 line
ip_blocks[i].version->funcs->name, r);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-4-return r; - } - }else { - r = adev->ip_blocks[i].version->funcs-Quoted 1 line
hw_init(adev);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-2-if (r) { - DRM_ERROR("hw_init of IPblock <%s> failed %d\n",
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-1- adev->ip_blocks[i].version-Quoted 1 line
funcs->name, r);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-2-return r; - } +return r; + } + }else { + r = adev->ip_blocks[i].version->funcs-Quoted 1 line
hw_init(adev);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+if (r) { + DRM_ERROR("hw_init of IP block <%s>failed %d\n",
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+ adev-Quoted 1 line
ip_blocks[i].version->funcs->name, r);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+return r;}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-1- adev->ip_blocks[i].status.hw = true;}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-0+ + adev->ip_blocks[i].status.hw = true; +break ;} } + r = amdgpu_pm_load_smu_firmware(adev, &smu_version); return r;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0@@ -2136,7 +2142,9 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev) if (r) {DRM_ERROR ("suspend of IP block <%s> failed %d\n" , adev->ip_blocks[i].version->funcs- >name, r); +return r; } + adev->ip_blocks[i].status.hw = false; }}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1@@ -2176,14 +2184,16 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) if (is_support_sw_smu(adev)) {/* todo */ } else if (adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->set_mp1_state) { + adev->powerplay.pp_funcs- >set_mp1_state) { r = adev->powerplay.pp_funcs-Quoted 1 line
set_mp1_state(
adev->powerplay.pp_handle, adev->mp1_state); if (r) { DRM_ERROR("SMC failed to set mp1 state %d, %d\n", adev->mp1_state, r);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+return r;}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+ adev->ip_blocks[i].status.hw = false;} } }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0@@ -2238,6 +2248,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) for (j = 0; j < adev->num_ip_blocks; j++) { block = &adev->ip_blocks[j]; + block->status.hw = false;if (block->version->type != ip_order[i] || !block->status.valid)continue;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0@@ -2246,6 +2257,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) DRM_INFO("RE-INIT-early: %s %s\n", block->version- >funcs->name, r?"failed":"succeeded");if (r)return r; + block->status.hw = true; }}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-1@@ -2273,13 +2285,15 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev) block = &adev->ip_blocks[j];if (block->version->type != ip_order[i] || - !block->status.valid) + !block->status.valid || + block->status.hw)continue ; r = block->version->funcs->hw_init (adev);DRM_INFO ("RE-INIT-late: %s %s\n" , block->version- >funcs->name, r?"failed":"succeeded");if (r)return r; + block->status.hw = true; }}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-1@@ -2303,17 +2317,19 @@ static int amdgpu_device_ip_resume_phase1(struct amdgpu_device *adev) int i, r;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_blocks[i].status.valid) +if (!adev->ip_blocks[i].status.valid || adev- >ip_blocks[i].status.hw)continue ;if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_COMMON || adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_GMC || adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_IH ) { + r = adev->ip_blocks[i].version->funcs->resume (adev);if (r) {DRM_ERROR ("resume of IP block <%s> failed %d\n" , adev->ip_blocks[i].version->funcs- >name, r);return r;}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+ adev->ip_blocks[i].status.hw = true;} }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1@@ -2338,7 +2354,7 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev)int i, r;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_blocks[i].status.valid) +if (!adev->ip_blocks[i].status.valid || adev- >ip_blocks[i].status.hw)continue ;if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON || adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC || @@ -2351,6 +2367,7 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev) adev->ip_blocks[i].version->funcs->name, r); return r; }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+ adev->ip_blocks[i].status.hw = true;} return 0;
Quoted 7 lines
--
2.7.4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx