drm/atomic-helper: WARN if fake_commit->hw_done is not completed as expected
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 22 Nov 2018 14:34:12 +0000 (16:34 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 23 Nov 2018 12:46:58 +0000 (14:46 +0200)
For real commits we WARN if ->hw_done hasn't been completed by the time
drm_atomic_helper_commit_cleanup_done() is called. Let's do the same for
the fake commit.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181122143412.11655-2-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
drivers/gpu/drm/drm_atomic_helper.c

index 269f1a74de38613edcbb56cf1d793b3d9a0bfe17..fe8dd8aa4ae409c55240d89bc9bdf7d94103570d 100644 (file)
@@ -2216,8 +2216,10 @@ void drm_atomic_helper_commit_cleanup_done(struct drm_atomic_state *old_state)
                spin_unlock(&crtc->commit_lock);
        }
 
-       if (old_state->fake_commit)
+       if (old_state->fake_commit) {
                complete_all(&old_state->fake_commit->cleanup_done);
+               WARN_ON(!try_wait_for_completion(&old_state->fake_commit->hw_done));
+       }
 }
 EXPORT_SYMBOL(drm_atomic_helper_commit_cleanup_done);