[PATCH] drm/amdgpu: Adjust IB test timeout for XGMI configuration

[Christian König]

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 at 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 at amd.com>.

Christian.

>   
>   	for (i = 0; i < adev->num_rings; ++i) {
>   		struct amdgpu_ring *ring = adev->rings[i];