* [PATCH 1/3] drm/amdgpu: delete duplicated printk info.
@ 2017-03-30 5:42 Rex Zhu
[not found] ` <1490852538-13276-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Rex Zhu @ 2017-03-30 5:42 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Rex Zhu
Change-Id: I5f336cc41b1868b98f263874fe5c6ea20e430744
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 57ccac4..eaf44fb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2288,9 +2288,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
if (r)
DRM_ERROR("amdgpu_resume failed (%d).\n", r);
- if (r)
- DRM_ERROR("amdgpu_resume failed (%d).\n", r);
-
amdgpu_fence_driver_resume(adev);
if (resume) {
--
1.9.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] drm/amdgpu: when resume failed, return error to avoid system hang.
[not found] ` <1490852538-13276-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
@ 2017-03-30 5:42 ` Rex Zhu
2017-03-30 5:42 ` [PATCH 3/3] drm/amdgpu: do not block gpu resume when cp ring test failed Rex Zhu
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Rex Zhu @ 2017-03-30 5:42 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Rex Zhu
Change-Id: I9e908edbb3f0c767b084ffaac7de5f97047eaa16
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index eaf44fb..18af88d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2285,9 +2285,10 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
}
r = amdgpu_resume(adev);
- if (r)
+ if (r) {
DRM_ERROR("amdgpu_resume failed (%d).\n", r);
-
+ return r;
+ }
amdgpu_fence_driver_resume(adev);
if (resume) {
--
1.9.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] drm/amdgpu: do not block gpu resume when cp ring test failed.
[not found] ` <1490852538-13276-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
2017-03-30 5:42 ` [PATCH 2/3] drm/amdgpu: when resume failed, return error to avoid system hang Rex Zhu
@ 2017-03-30 5:42 ` Rex Zhu
[not found] ` <1490852538-13276-3-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
2017-03-30 6:43 ` [PATCH 1/3] drm/amdgpu: delete duplicated printk info Michel Dänzer
2017-03-30 8:40 ` Christian König
3 siblings, 1 reply; 6+ messages in thread
From: Rex Zhu @ 2017-03-30 5:42 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Rex Zhu
As kiq enabled, ring test may randomly failed because of timing.
it was not critial error, gpu can continue to resume.
Change-Id: I5d85c7d5b5989dd6892a13b47a5322b33e8a48ac
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 31b1312..cdda93b 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -4975,8 +4975,7 @@ static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev)
goto done;
ring->ready = true;
- r = amdgpu_ring_test_ring(ring);
- if (r)
+ if (amdgpu_ring_test_ring(ring))
ring->ready = false;
}
--
1.9.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] drm/amdgpu: do not block gpu resume when cp ring test failed.
[not found] ` <1490852538-13276-3-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
@ 2017-03-30 6:14 ` Michel Dänzer
0 siblings, 0 replies; 6+ messages in thread
From: Michel Dänzer @ 2017-03-30 6:14 UTC (permalink / raw)
To: Rex Zhu; +Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On 30/03/17 02:42 PM, Rex Zhu wrote:
> As kiq enabled, ring test may randomly failed because of timing.
> it was not critial error, gpu can continue to resume.
>
> Change-Id: I5d85c7d5b5989dd6892a13b47a5322b33e8a48ac
> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index 31b1312..cdda93b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -4975,8 +4975,7 @@ static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev)
> goto done;
>
> ring->ready = true;
> - r = amdgpu_ring_test_ring(ring);
> - if (r)
> + if (amdgpu_ring_test_ring(ring))
> ring->ready = false;
> }
>
>
The random failures in amdgpu_ring_test_ring need to be fixed instead.
Failure in there normally does mean we cannot continue.
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] drm/amdgpu: delete duplicated printk info.
[not found] ` <1490852538-13276-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
2017-03-30 5:42 ` [PATCH 2/3] drm/amdgpu: when resume failed, return error to avoid system hang Rex Zhu
2017-03-30 5:42 ` [PATCH 3/3] drm/amdgpu: do not block gpu resume when cp ring test failed Rex Zhu
@ 2017-03-30 6:43 ` Michel Dänzer
2017-03-30 8:40 ` Christian König
3 siblings, 0 replies; 6+ messages in thread
From: Michel Dänzer @ 2017-03-30 6:43 UTC (permalink / raw)
To: Rex Zhu; +Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On 30/03/17 02:42 PM, Rex Zhu wrote:
> Change-Id: I5f336cc41b1868b98f263874fe5c6ea20e430744
> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 57ccac4..eaf44fb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2288,9 +2288,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
> if (r)
> DRM_ERROR("amdgpu_resume failed (%d).\n", r);
>
> - if (r)
> - DRM_ERROR("amdgpu_resume failed (%d).\n", r);
> -
> amdgpu_fence_driver_resume(adev);
>
> if (resume) {
>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] drm/amdgpu: delete duplicated printk info.
[not found] ` <1490852538-13276-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
` (2 preceding siblings ...)
2017-03-30 6:43 ` [PATCH 1/3] drm/amdgpu: delete duplicated printk info Michel Dänzer
@ 2017-03-30 8:40 ` Christian König
3 siblings, 0 replies; 6+ messages in thread
From: Christian König @ 2017-03-30 8:40 UTC (permalink / raw)
To: Rex Zhu, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Patch 1 and 2 are Reviewed-by: Christian König <christian.koenig@amd.com>.
Patch 3 is a clear NAK. The ring test is there to make sure that the
hardware is working as expected before proceeding.
If it fails randomly with KIQ enabled we need to figure out why and not
just disable the test.
Christian.
Am 30.03.2017 um 07:42 schrieb Rex Zhu:
> Change-Id: I5f336cc41b1868b98f263874fe5c6ea20e430744
> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 57ccac4..eaf44fb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2288,9 +2288,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
> if (r)
> DRM_ERROR("amdgpu_resume failed (%d).\n", r);
>
> - if (r)
> - DRM_ERROR("amdgpu_resume failed (%d).\n", r);
> -
> amdgpu_fence_driver_resume(adev);
>
> if (resume) {
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-30 8:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-30 5:42 [PATCH 1/3] drm/amdgpu: delete duplicated printk info Rex Zhu
[not found] ` <1490852538-13276-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
2017-03-30 5:42 ` [PATCH 2/3] drm/amdgpu: when resume failed, return error to avoid system hang Rex Zhu
2017-03-30 5:42 ` [PATCH 3/3] drm/amdgpu: do not block gpu resume when cp ring test failed Rex Zhu
[not found] ` <1490852538-13276-3-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
2017-03-30 6:14 ` Michel Dänzer
2017-03-30 6:43 ` [PATCH 1/3] drm/amdgpu: delete duplicated printk info Michel Dänzer
2017-03-30 8:40 ` Christian König
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.