From: Mario Limonciello <mario.limoncie...@amd.com>

amdgpu_dm_commit_zero_streams() returns a DC error code that isn't
checked. Add an explicit check to this and fail dm_suspend() if it
is not DC_OK.

Reviewed-by: Alex Hung <alex.h...@amd.com>
Signed-off-by: Mario Limonciello <mario.limoncie...@amd.com>
Signed-off-by: Wayne Lin <wayne....@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 6473622e2bf8..fbeb3e89675b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3144,6 +3144,8 @@ static int dm_suspend(struct amdgpu_ip_block *ip_block)
        struct amdgpu_display_manager *dm = &adev->dm;
 
        if (amdgpu_in_reset(adev)) {
+               enum dc_status res;
+
                mutex_lock(&dm->dc_lock);
 
                dc_allow_idle_optimizations(adev->dm.dc, false);
@@ -3153,7 +3155,11 @@ static int dm_suspend(struct amdgpu_ip_block *ip_block)
                if (dm->cached_dc_state)
                        dm_gpureset_toggle_interrupts(adev, 
dm->cached_dc_state, false);
 
-               amdgpu_dm_commit_zero_streams(dm->dc);
+               res = amdgpu_dm_commit_zero_streams(dm->dc);
+               if (res != DC_OK) {
+                       drm_err(adev_to_drm(adev), "Failed to commit zero 
streams: %d\n", res);
+                       return -EINVAL;
+               }
 
                amdgpu_dm_irq_suspend(adev);
 
-- 
2.37.3

Reply via email to