* [PATCH] drm/amdgpu: Adjust IB test timeout for XGMI configuration
@ 2019-04-03 15:42 Liu, Shaoyun
[not found] ` <1554306139-17280-1-git-send-email-shaoyun.liu-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Liu, Shaoyun @ 2019-04-03 15:42 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Liu, Shaoyun
On XGMI configuration the ib test may tooks longer to finish
Change-Id: If3afd8eac3c342d32c387804b51fc4a4bdd35d35
Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 0b8ef2d..6c508d7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -35,6 +35,7 @@
#include "amdgpu_trace.h"
#define AMDGPU_IB_TEST_TIMEOUT msecs_to_jiffies(1000)
+#define AMDGPU_IB_TEST_GFX_XGMI_TIMEOU msecs_to_jiffies(2000)
/*
* IB
@@ -344,7 +345,8 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
* cost waiting for it coming back under RUNTIME only
*/
tmo_gfx = 8 * AMDGPU_IB_TEST_TIMEOUT;
- }
+ } else if (adev->gmc.xgmi.hive_id)
+ tmo_gfx = AMDGPU_IB_TEST_GFX_XGMI_TIMEOU;
for (i = 0; i < adev->num_rings; ++i) {
struct amdgpu_ring *ring = adev->rings[i];
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amdgpu: Adjust IB test timeout for XGMI configuration
[not found] ` <1554306139-17280-1-git-send-email-shaoyun.liu-5C7GfCeVMHo@public.gmane.org>
@ 2019-04-03 17:02 ` Alex Deucher
2019-04-03 17:12 ` Christian König
1 sibling, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2019-04-03 17:02 UTC (permalink / raw)
To: Liu, Shaoyun; +Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On Wed, Apr 3, 2019 at 11:42 AM Liu, Shaoyun <Shaoyun.Liu@amd.com> wrote:
>
> On XGMI configuration the ib test may tooks longer to finish
>
> Change-Id: If3afd8eac3c342d32c387804b51fc4a4bdd35d35
> Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> index 0b8ef2d..6c508d7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> @@ -35,6 +35,7 @@
> #include "amdgpu_trace.h"
>
> #define AMDGPU_IB_TEST_TIMEOUT msecs_to_jiffies(1000)
> +#define AMDGPU_IB_TEST_GFX_XGMI_TIMEOU msecs_to_jiffies(2000)
Typo:
TIMEOU -> TIMEOUT
>
> /*
> * IB
> @@ -344,7 +345,8 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
> * cost waiting for it coming back under RUNTIME only
> */
> tmo_gfx = 8 * AMDGPU_IB_TEST_TIMEOUT;
> - }
> + } else if (adev->gmc.xgmi.hive_id)
> + tmo_gfx = AMDGPU_IB_TEST_GFX_XGMI_TIMEOU;
>
Coding style, if any clause has parens, all should. With these issues
fixed, patch is:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> for (i = 0; i < adev->num_rings; ++i) {
> struct amdgpu_ring *ring = adev->rings[i];
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amdgpu: Adjust IB test timeout for XGMI configuration
[not found] ` <1554306139-17280-1-git-send-email-shaoyun.liu-5C7GfCeVMHo@public.gmane.org>
2019-04-03 17:02 ` Alex Deucher
@ 2019-04-03 17:12 ` Christian König
[not found] ` <627a8360-3393-3fb3-4412-18e2b9adf771-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
1 sibling, 1 reply; 7+ messages in thread
From: Christian König @ 2019-04-03 17:12 UTC (permalink / raw)
To: Liu, Shaoyun, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Am 03.04.19 um 17:42 schrieb Liu, Shaoyun:
> On XGMI configuration the ib test may tooks longer to finish
>
> Change-Id: If3afd8eac3c342d32c387804b51fc4a4bdd35d35
> Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> index 0b8ef2d..6c508d7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> @@ -35,6 +35,7 @@
> #include "amdgpu_trace.h"
>
> #define AMDGPU_IB_TEST_TIMEOUT msecs_to_jiffies(1000)
> +#define AMDGPU_IB_TEST_GFX_XGMI_TIMEOU msecs_to_jiffies(2000)
>
> /*
> * IB
> @@ -344,7 +345,8 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
> * cost waiting for it coming back under RUNTIME only
> */
> tmo_gfx = 8 * AMDGPU_IB_TEST_TIMEOUT;
> - }
> + } else if (adev->gmc.xgmi.hive_id)
> + tmo_gfx = AMDGPU_IB_TEST_GFX_XGMI_TIMEOU;
A style nit pick here: The "else" branch should have { } as well when
the "if" has them.
Apart from that the patch is Reviewed-by: Christian König
<christian.koenig@amd.com>.
Christian.
>
> for (i = 0; i < adev->num_rings; ++i) {
> struct amdgpu_ring *ring = adev->rings[i];
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amdgpu: Adjust IB test timeout for XGMI configuration
[not found] ` <627a8360-3393-3fb3-4412-18e2b9adf771-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2019-04-03 17:15 ` Liu, Shaoyun
0 siblings, 0 replies; 7+ messages in thread
From: Liu, Shaoyun @ 2019-04-03 17:15 UTC (permalink / raw)
To: Koenig, Christian, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Thanks , changed as suggested and pushed
Shaoyun.liu
On 2019-04-03 1:12 p.m., Christian König wrote:
> Am 03.04.19 um 17:42 schrieb Liu, Shaoyun:
>> On XGMI configuration the ib test may tooks longer to finish
>>
>> Change-Id: If3afd8eac3c342d32c387804b51fc4a4bdd35d35
>> Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
>> index 0b8ef2d..6c508d7 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
>> @@ -35,6 +35,7 @@
>> #include "amdgpu_trace.h"
>> #define AMDGPU_IB_TEST_TIMEOUT msecs_to_jiffies(1000)
>> +#define AMDGPU_IB_TEST_GFX_XGMI_TIMEOU msecs_to_jiffies(2000)
>> /*
>> * IB
>> @@ -344,7 +345,8 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
>> * cost waiting for it coming back under RUNTIME only
>> */
>> tmo_gfx = 8 * AMDGPU_IB_TEST_TIMEOUT;
>> - }
>> + } else if (adev->gmc.xgmi.hive_id)
>> + tmo_gfx = AMDGPU_IB_TEST_GFX_XGMI_TIMEOU;
>
> A style nit pick here: The "else" branch should have { } as well when
> the "if" has them.
>
> Apart from that the patch is Reviewed-by: Christian König
> <christian.koenig@amd.com>.
>
> Christian.
>
>> for (i = 0; i < adev->num_rings; ++i) {
>> struct amdgpu_ring *ring = adev->rings[i];
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] drm/amdgpu: Adjust IB test timeout for XGMI configuration
@ 2019-04-03 17:06 Liu, Shaoyun
0 siblings, 0 replies; 7+ messages in thread
From: Liu, Shaoyun @ 2019-04-03 17:06 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Liu, Shaoyun
On XGMI configuration the ib test may take longer to finish
Change-Id: If3afd8eac3c342d32c387804b51fc4a4bdd35d35
Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 0b8ef2d..5049845 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -35,6 +35,7 @@
#include "amdgpu_trace.h"
#define AMDGPU_IB_TEST_TIMEOUT msecs_to_jiffies(1000)
+#define AMDGPU_IB_TEST_GFX_XGMI_TIMEOUT msecs_to_jiffies(2000)
/*
* IB
@@ -344,7 +345,8 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
* cost waiting for it coming back under RUNTIME only
*/
tmo_gfx = 8 * AMDGPU_IB_TEST_TIMEOUT;
- }
+ } else if (adev->gmc.xgmi.hive_id)
+ tmo_gfx = AMDGPU_IB_TEST_GFX_XGMI_TIMEOUT;
for (i = 0; i < adev->num_rings; ++i) {
struct amdgpu_ring *ring = adev->rings[i];
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amdgpu: Adjust IB test timeout for XGMI configuration
[not found] ` <1554228693-28822-1-git-send-email-shaoyun.liu-5C7GfCeVMHo@public.gmane.org>
@ 2019-04-03 7:55 ` Christian König
0 siblings, 0 replies; 7+ messages in thread
From: Christian König @ 2019-04-03 7:55 UTC (permalink / raw)
To: Liu, Shaoyun, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Am 02.04.19 um 20:12 schrieb Liu, Shaoyun:
> On XGMI configuration the ib test may tooks longer to finish
>
> Change-Id: If3afd8eac3c342d32c387804b51fc4a4bdd35d35
> Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> index 0b8ef2d..45f251f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> @@ -346,6 +346,9 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
> tmo_gfx = 8 * AMDGPU_IB_TEST_TIMEOUT;
> }
>
> + if (adev->gmc.xgmi.hive_id)
> + tmo_gfx = 2 * AMDGPU_IB_TEST_TIMEOUT;
> +
Probably better to use an "else if" to note that those two mutual exclusive.
Additional to that I think it is time now to add
AMDGPU_IB_TEST_GFX_XGMI_TIMEOUT define instead of just abusing the
existing one over and over again (same of course for the SRIOV case).
Christian.
> for (i = 0; i < adev->num_rings; ++i) {
> struct amdgpu_ring *ring = adev->rings[i];
> long tmo;
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] drm/amdgpu: Adjust IB test timeout for XGMI configuration
@ 2019-04-02 18:12 Liu, Shaoyun
[not found] ` <1554228693-28822-1-git-send-email-shaoyun.liu-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Liu, Shaoyun @ 2019-04-02 18:12 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Liu, Shaoyun
On XGMI configuration the ib test may tooks longer to finish
Change-Id: If3afd8eac3c342d32c387804b51fc4a4bdd35d35
Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 0b8ef2d..45f251f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -346,6 +346,9 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
tmo_gfx = 8 * AMDGPU_IB_TEST_TIMEOUT;
}
+ if (adev->gmc.xgmi.hive_id)
+ tmo_gfx = 2 * AMDGPU_IB_TEST_TIMEOUT;
+
for (i = 0; i < adev->num_rings; ++i) {
struct amdgpu_ring *ring = adev->rings[i];
long tmo;
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-04-03 17:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-03 15:42 [PATCH] drm/amdgpu: Adjust IB test timeout for XGMI configuration Liu, Shaoyun
[not found] ` <1554306139-17280-1-git-send-email-shaoyun.liu-5C7GfCeVMHo@public.gmane.org>
2019-04-03 17:02 ` Alex Deucher
2019-04-03 17:12 ` Christian König
[not found] ` <627a8360-3393-3fb3-4412-18e2b9adf771-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-04-03 17:15 ` Liu, Shaoyun
-- strict thread matches above, loose matches on Subject: below --
2019-04-03 17:06 Liu, Shaoyun
2019-04-02 18:12 Liu, Shaoyun
[not found] ` <1554228693-28822-1-git-send-email-shaoyun.liu-5C7GfCeVMHo@public.gmane.org>
2019-04-03 7:55 ` 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.