drm/amdgpu: fix ring0 failed on firepro card
Subsystems (2)
PATCH 1/2 drm/amdgpu: fix ring0 failed on firepro card
the root cause is vram content is lost completely after pci reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 57 ++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +50 -7
@@ -1787,13 +1787,40 @@ static int amdgpu_sriov_reinit_late(struct amdgpu_device *adev)return 0 ; } -static int amdgpu_resume (struct amdgpu_device *adev) +static int amdgpu_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)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; + } + } + } + +return 0 ; +} + +static int amdgpu_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) +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 ) +continue ; r = adev->ip_blocks[i].version->funcs->resume (adev);if (r) { DRM_ERROR("resume of IP block <%s> failed %d\n",
@@ -1805,6 +1832,18 @@ static int amdgpu_resume(struct amdgpu_device *adev)return 0 ; } +static int amdgpu_resume (struct amdgpu_device *adev) +{ +int r; + + r =amdgpu_resume_phase1 (adev); +if (r) +return r; + r =amdgpu_resume_phase2 (adev); + +return r; +} +static void amdgpu_device_detect_sriov_bios (struct amdgpu_device *adev) {if (adev->is_atom_fw) {
@@ -2730,16 +2769,20 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)if (!r) {dev_info (adev->dev,"GPU reset succeeded, trying to resume\n" ); - r =amdgpu_resume (adev); + r =amdgpu_resume_phase1 (adev); +if (r) + goto out; + r =amdgpu_ttm_recover_gart (adev); +if (r) + goto out; + r =amdgpu_resume_phase2 (adev); +if (r) + goto out; } } +out:if (!r) {amdgpu_irq_gpu_reset_resume_helper (adev); -if (need_full_reset &&amdgpu_need_backup (adev)) { - r =amdgpu_ttm_recover_gart (adev); -if (r) -DRM_ERROR ("gart recovery failed!!!\n" ); - } r =amdgpu_ib_ring_tests (adev);if (r) {dev_err (adev->dev,"ib ring test failed (%d).\n" , r);
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1493966737-14621-1-git-send-email-David1.Zhou-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu: print when gpu reset successed
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -2
@@ -2847,10 +2847,11 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)drm_helper_resume_force_mode (adev->ddev);ttm_bo_unlock_delayed_workqueue (&adev->mman.bdev, resched); -if (r) { +if (r)/* bad news, how to tell it to userspace ? */ dev_info (adev->dev,"GPU reset failed\n" ); - } +else +dev_info (adev->dev,"GPU reset successed!\n" );return r; }
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1493966737-14621-2-git-send-email-David1.Zhou-5C7GfCeVMHo@public.gmane.org
He, Hongbo
Reviewed-by Roger.HeRE: [PATCH 2/2] drm/amdgpu: print when gpu reset successed
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Chunming Zhou
Sent: Friday, May 05, 2017 2:46 PM
To: [email protected]
Cc: Zhou, David(ChunMing)
Subject: [PATCH 2/2] drm/amdgpu: print when gpu reset successed
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -2
@@ -2847,10 +2847,11 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)drm_helper_resume_force_mode (adev->ddev);ttm_bo_unlock_delayed_workqueue (&adev->mman.bdev, resched); -if (r) { +if (r)/* bad news, how to tell it to userspace ? */ dev_info (adev->dev,"GPU reset failed\n" ); - } +else +dev_info (adev->dev,"GPU reset successed!\n" );return r; }
Signature · 10 lines
1.9.1 _______________________________________________ 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): MWHPR1201MB01273631383B29DA4DA2783CFDEB0-3iK1xFAIwjq9imrIu4W8xGrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/[email protected]
Christian König
Reviewed-byRe: [PATCH 2/2] drm/amdgpu: print when gpu reset successed
Am 05.05.2017 um 09:47 schrieb He, Hongbo:
Quoted 23 lines
Reviewed-by Roger.He <[email protected]>-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Chunming Zhou
Sent: Friday, May 05, 2017 2:46 PM
To: [email protected]
Cc: Zhou, David(ChunMing)
Subject: [PATCH 2/2] drm/amdgpu: print when gpu reset successedChange-Id I98d96b566b1fd21d90a0bb037f5b8ba8f1857c98Signed-off-by Chunming Zhou <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -2847,10 +2847,11 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)drm_helper_resume_force_mode (adev->ddev);ttm_bo_unlock_delayed_workqueue (&adev->mman.bdev, resched);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c int amdgpu_gpu_reset(struct amdgpu_device *adev) · line 2857
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-2-if (r) { +if (r)/* bad news, how to tell it to userspace ? */ dev_info (adev->dev,"GPU reset failed\n" ); - } +else +dev_info (adev->dev,"GPU reset successed!\n" );return r; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Looks fine to me, Reviewed-by: Roger.He <[email protected]>
BTW, I have noticed SRIOV has more IP resume in first phase, maybe also needed for bare metal for other ASIC.
Thanks
Roger(Hongbo.He)
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Chunming Zhou
Sent: Friday, May 05, 2017 2:46 PM
To: [email protected]
Cc: Zhou, David(ChunMing)
Subject: [PATCH 1/2] drm/amdgpu: fix ring0 failed on firepro card
the root cause is vram content is lost completely after pci reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 57 ++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +27 -1
@@ -1787,13 +1787,40 @@ static int amdgpu_sriov_reinit_late(struct amdgpu_device *adev)return 0 ; } -static int amdgpu_resume (struct amdgpu_device *adev) +static int amdgpu_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)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; + } + } + } + +return 0 ; +} + +static int amdgpu_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) +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 ) +continue ; r = adev->ip_blocks[i].version->funcs->resume (adev);if (r) { DRM_ERROR("resume of IP block <%s> failed %d\n", @@ -1805,6 +1832,18 @@ static int amdgpu_resume(struct amdgpu_device *adev)
return 0;
}
+static int amdgpu_resume(struct amdgpu_device *adev) {
+ int r;
+
+ r = amdgpu_resume_phase1(adev);
+ if (r)
+ return r;
+ r = amdgpu_resume_phase2(adev);
+
+ return r;
+}
+
static void amdgpu_device_detect_sriov_bios(struct amdgpu_device *adev) {
if (adev->is_atom_fw) {
@@ -2730,16 +2769,20 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)
if (!r) {
dev_info(adev->dev, "GPU reset succeeded, trying to resume\n");
- r = amdgpu_resume(adev);
+ r = amdgpu_resume_phase1(adev);
+ if (r)
+ goto out;
+ r = amdgpu_ttm_recover_gart(adev);
+ if (r)
+ goto out;
+ r = amdgpu_resume_phase2(adev);
+ if (r)
+ goto out;
}
}
+out:
if (!r) {
amdgpu_irq_gpu_reset_resume_helper(adev);
- if (need_full_reset && amdgpu_need_backup(adev)) {
- r = amdgpu_ttm_recover_gart(adev);
- if (r)
- DRM_ERROR("gart recovery failed!!!\n");
- }
r = amdgpu_ib_ring_tests(adev);
if (r) {
dev_err(adev->dev, "ib ring test failed (%d).\n", r);
--
1.9.1
_______________________________________________
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): MWHPR1201MB0127C917F4B4A02CF4B4318BFDEB0-3iK1xFAIwjq9imrIu4W8xGrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/[email protected]
We should really improve the order in which blocks are handled.
Having all this special order handling in amdgpu_device.c and for SRIOV is really not a good idea.
Anyway, patch is Acked-by: Christian König <[email protected]> for now.
Regards,
Christian.
Am 05.05.2017 um 09:46 schrieb He, Hongbo:
Quoted 112 lines
Looks fine to me, Reviewed-by: Roger.He <[email protected]>
BTW, I have noticed SRIOV has more IP resume in first phase, maybe also needed for bare metal for other ASIC.
Thanks
Roger(Hongbo.He)
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Chunming Zhou
Sent: Friday, May 05, 2017 2:46 PM
To: [email protected]
Cc: Zhou, David(ChunMing)
Subject: [PATCH 1/2] drm/amdgpu: fix ring0 failed on firepro cardthe root cause is vram content is lost completely after pci reset.
Change-Id I012cea984702894410b0f05149fd017bb62b624cSigned-off-by Chunming Zhou <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 57 ++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +48
-8@@ -1787,13 +1787,40 @@ static int amdgpu_sriov_reinit_late(struct amdgpu_device *adev)return 0 ; } -static int amdgpu_resume (struct amdgpu_device *adev) +static int amdgpu_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)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; + } + } + } + +return 0 ; +} + +static int amdgpu_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) +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 ) +continue ; r = adev->ip_blocks[i].version->funcs->resume (adev);if (r) { DRM_ERROR("resume of IP block <%s> failed %d\n", @@ -1805,6 +1832,18 @@ static int amdgpu_resume(struct amdgpu_device *adev) return 0; } +static int amdgpu_resume (struct amdgpu_device *adev) { +int r; + + r =amdgpu_resume_phase1 (adev); +if (r) +return r; + r =amdgpu_resume_phase2 (adev); + +return r; +} +static void amdgpu_device_detect_sriov_bios (struct amdgpu_device *adev) {if (adev->is_atom_fw) {@@ -2730,16 +2769,20 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)if (!r) {dev_info (adev->dev,"GPU reset succeeded, trying to resume\n" ); - r =amdgpu_resume (adev); + r =amdgpu_resume_phase1 (adev); +if (r) + goto out; + r =amdgpu_ttm_recover_gart (adev); +if (r) + goto out; + r =amdgpu_resume_phase2 (adev); +if (r) + goto out; } } +out:if (!r) {amdgpu_irq_gpu_reset_resume_helper (adev); -if (need_full_reset &&amdgpu_need_backup (adev)) { - r =amdgpu_ttm_recover_gart (adev); -if (r) -DRM_ERROR ("gart recovery failed!!!\n" ); - } r =amdgpu_ib_ring_tests (adev);if (r) {dev_err (adev->dev,"ib ring test failed (%d).\n" , r); --1.9.1
Quoted 8 lines
_______________________________________________
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
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
Acked-byQuoted 4 lines · Chunming Zhou
the root cause is vram content is lost completely after pci reset.
Change-Id I012cea984702894410b0f05149fd017bb62b624cSigned-off-by Chunming Zhou <[email protected]>
Let's see if it makes sense to change the order globally so we can avoid things like this and unify the sr-iov code as well. series is:
Quoted 99 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 57 ++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +50
-8@@ -1787,13 +1787,40 @@ static int amdgpu_sriov_reinit_late(struct amdgpu_device *adev)return 0 ; } -static int amdgpu_resume (struct amdgpu_device *adev) +static int amdgpu_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)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; + } + } + } + +return 0 ; +} + +static int amdgpu_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) +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 ) +continue ; r = adev->ip_blocks[i].version->funcs->resume (adev);if (r) { DRM_ERROR("resume of IP block <%s> failed %d\n",@@ -1805,6 +1832,18 @@ static int amdgpu_resume(struct amdgpu_device *adev)return 0 ; } +static int amdgpu_resume (struct amdgpu_device *adev) +{ +int r; + + r =amdgpu_resume_phase1 (adev); +if (r) +return r; + r =amdgpu_resume_phase2 (adev); + +return r; +} +static void amdgpu_device_detect_sriov_bios (struct amdgpu_device *adev) {if (adev->is_atom_fw) {@@ -2730,16 +2769,20 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)if (!r) {dev_info (adev->dev,"GPU reset succeeded, trying to resume\n" ); - r =amdgpu_resume (adev); + r =amdgpu_resume_phase1 (adev); +if (r) + goto out; + r =amdgpu_ttm_recover_gart (adev); +if (r) + goto out; + r =amdgpu_resume_phase2 (adev); +if (r) + goto out; } } +out:if (!r) {amdgpu_irq_gpu_reset_resume_helper (adev); -if (need_full_reset &&amdgpu_need_backup (adev)) { - r =amdgpu_ttm_recover_gart (adev); -if (r) -DRM_ERROR ("gart recovery failed!!!\n" ); - } r =amdgpu_ib_ring_tests (adev);if (r) {dev_err (adev->dev,"ib ring test failed (%d).\n" , r); --1.9.1
Quoted 4 lines
_______________________________________________
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