Am 30.06.2016 um 11:34 schrieb Chunming Zhou:
> Change-Id: I5f88ed641b85822b8b76684ac623117756cc0295
> Signed-off-by: Chunming Zhou <David1.Zhou at amd.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 0759c23..d53089f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -1998,6 +1998,16 @@ retry:
> /* restore scratch */
> amdgpu_atombios_scratch_regs_restore(adev);
> if (!r) {
> + r = amdgpu_ib_ring_tests(adev);
> + if (r) {
> + dev_err(adev->dev, "ib ring test failed (%d).\n", r);
> + if (saved) {
> + saved = false;
> + r = amdgpu_suspend(adev);
> + goto retry;
> + }
> + }
> +
> for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
> struct amdgpu_ring *ring = adev->rings[i];
> if (!ring)
> @@ -2008,16 +2018,6 @@ retry:
> ring_sizes[i] = 0;
> ring_data[i] = NULL;
> }
> -
> - r = amdgpu_ib_ring_tests(adev);
> - if (r) {
> - dev_err(adev->dev, "ib ring test failed (%d).\n", r);
> - if (saved) {
> - saved = false;
> - r = amdgpu_suspend(adev);
> - goto retry;
> - }
> - }
> } else {
> dev_err(adev->dev, "asic resume failed (%d).\n", r);
> for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
