drm/amd/amdgpu: Fix flow control in uvd_v4_2_stop()

Break out of outer loop properly.

Signed-off-by: Tom St Denis <[email protected]>
Reported-by: Dan Carpenter <[email protected]>
Reviewed-by: Christian König <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
index 97af4827f652b3642f38bde035bf8ccf707a9e1b..b34cefc7ebd5b0d67033bf9f89604994d39ff527 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
@@ -401,7 +401,8 @@ static void uvd_v4_2_stop(struct amdgpu_device *adev)
                                break;
                        mdelay(1);
                }
-               break;
+               if (status & 2)
+                       break;
        }
 
        for (i = 0; i < 10; ++i) {
@@ -411,7 +412,8 @@ static void uvd_v4_2_stop(struct amdgpu_device *adev)
                                break;
                        mdelay(1);
                }
-               break;
+               if (status & 0xf)
+                       break;
        }
 
        /* Stall UMC and register bus before resetting VCPU */
@@ -424,7 +426,8 @@ static void uvd_v4_2_stop(struct amdgpu_device *adev)
                                break;
                        mdelay(1);
                }
-               break;
+               if (status & 0x240)
+                       break;
        }
 
        WREG32_P(0x3D49, 0, ~(1 << 2));