diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-10-20 07:18:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-10-20 12:26:26 +1000 |
| commit | fe7acd1e303d74584040a902d78726ba5a4b9b4a (patch) | |
| tree | e5b0c5ecc5cca0db9c9b44526c8b569851b9c9ee /drivers/gpu/drm/drm_atomic.c | |
| parent | f8e6e1b6f0ae3bb91cdcd08213d36a0ce6e98535 (diff) | |
| parent | e84cb605e02f1b3d0aee8d7157419cd8aaa06038 (diff) | |
| download | linux-fe7acd1e303d74584040a902d78726ba5a4b9b4a.tar.bz2 | |
Merge tag 'drm-misc-fixes-2018-10-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Second pull request for v4.19:
- Fix ulong overflow in sun4i
- Fix a serious GPF in waiting for flip_done from commit_tail().
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/97d1ed42-1d99-fcc5-291e-cd1dc29a4252@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 018fcdb353d2..281cf9cbb44c 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -174,6 +174,11 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state) state->crtcs[i].state = NULL; state->crtcs[i].old_state = NULL; state->crtcs[i].new_state = NULL; + + if (state->crtcs[i].commit) { + drm_crtc_commit_put(state->crtcs[i].commit); + state->crtcs[i].commit = NULL; + } } for (i = 0; i < config->num_total_plane; i++) { |