diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-10 23:06:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-10 23:06:46 +0200 |
| commit | 95c4629d92d15d10e5f7c55bfb72583f96a91374 (patch) | |
| tree | ef9b973bfbf9f85659f4fc2794d8271bd19c4857 /drivers/gpu/drm/drm_plane.c | |
| parent | Merge branch 'sparc64-queued-locks' (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | linux-95c4629d92d15d10e5f7c55bfb72583f96a91374.tar.xz linux-95c4629d92d15d10e5f7c55bfb72583f96a91374.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'drivers/gpu/drm/drm_plane.c')
| -rw-r--r-- | drivers/gpu/drm/drm_plane.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index fedd4d60d9cd..5dc8c4350602 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -948,8 +948,6 @@ retry: } out: - if (ret && crtc->funcs->page_flip_target) - drm_crtc_vblank_put(crtc); if (fb) drm_framebuffer_put(fb); if (crtc->primary->old_fb) @@ -964,5 +962,8 @@ out: drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); + if (ret && crtc->funcs->page_flip_target) + drm_crtc_vblank_put(crtc); + return ret; } |