diff options
| author | Ville Syrjälä | 2018-11-22 15:34:12 +0100 |
|---|---|---|
| committer | Ville Syrjälä | 2018-11-23 13:46:58 +0100 |
| commit | 10a599fabbe54a0159b5b706aaad608400acd599 (patch) | |
| tree | a81575aa07050b0c8f09a343b8d9fab53733382b /drivers/gpu | |
| parent | drm/atomic-helper: Complete fake_commit->flip_done potentially earlier (diff) | |
| download | kernel-qcow2-linux-10a599fabbe54a0159b5b706aaad608400acd599.tar.gz kernel-qcow2-linux-10a599fabbe54a0159b5b706aaad608400acd599.tar.xz kernel-qcow2-linux-10a599fabbe54a0159b5b706aaad608400acd599.zip | |
drm/atomic-helper: WARN if fake_commit->hw_done is not completed as expected
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 269f1a74de38..fe8dd8aa4ae4 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -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); |