diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-27 09:33:49 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-27 09:33:49 +0200 |
| commit | 64282ea2d2a90437c0739ce016b80a1dec16507e (patch) | |
| tree | f1d484bb588a0739fda81db193325cf0c0d553ea /drivers/gpu/drm/tilcdc/tilcdc_drv.c | |
| parent | d2939424ff89f1ee3aeefdd030cba6ba163e77ac (diff) | |
| parent | e6742e1021a5cec55fab50a0b115c65217488eda (diff) | |
| download | op-kernel-dev-64282ea2d2a90437c0739ce016b80a1dec16507e.zip op-kernel-dev-64282ea2d2a90437c0739ce016b80a1dec16507e.tar.gz | |
Merge airlied/drm-next into drm-intel-next-queued
Resync with upstream to avoid git getting too badly confused. Also, we
have a conflict with the drm_vblank_cleanup removal, which cannot be
resolved by simply taking our side. Bake that in properly.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/tilcdc/tilcdc_drv.c')
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index d67e189..049d2f5 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c @@ -108,7 +108,11 @@ static int tilcdc_commit(struct drm_device *dev, if (ret) return ret; - drm_atomic_helper_swap_state(state, true); + ret = drm_atomic_helper_swap_state(state, true); + if (ret) { + drm_atomic_helper_cleanup_planes(dev, state); + return ret; + } /* * Everything below can be run asynchronously without the need to grab |
