diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-11-15 03:18:56 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2018-11-15 03:19:24 +0300 |
| commit | 62ccc3924eff37012bd0c227d8b7dc71188fc358 (patch) | |
| tree | 48cf255186d6961afb2fce522101404ba3f22d00 /drivers/gpu/drm/amd | |
| parent | d769a1aa14d3d0e380151048b94aeb6919ace533 (diff) | |
| parent | 6559b2338d96ec330887871d47e1ced520bc4f03 (diff) | |
| download | linux-62ccc3924eff37012bd0c227d8b7dc71188fc358.tar.xz | |
Merge tag 'v4.18.19' into dev-4.18
This is the 4.18.19 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 |
1 files changed, 8 insertions, 2 deletions
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 e484d0a94bdc..5b9cc3aeaa55 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4494,12 +4494,18 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) } spin_unlock_irqrestore(&adev->ddev->event_lock, flags); - /* Signal HW programming completion */ - drm_atomic_helper_commit_hw_done(state); if (wait_for_vblank) drm_atomic_helper_wait_for_flip_done(dev, state); + /* + * FIXME: + * Delay hw_done() until flip_done() is signaled. This is to block + * another commit from freeing the CRTC state while we're still + * waiting on flip_done. + */ + drm_atomic_helper_commit_hw_done(state); + drm_atomic_helper_cleanup_planes(dev, state); /* Finally, drop a runtime PM reference for each newly disabled CRTC, |