diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-17 12:38:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-17 12:39:04 +1000 |
| commit | 9ca70356a9260403c1bda40d942935e55d00c11c (patch) | |
| tree | b9a7af5394d9b306d8ba2b809c729951eb54e1c5 /drivers/gpu/drm/drm_framebuffer.c | |
| parent | 08293fe8d3f297a0b092855d2e94b18f1c1300d5 (diff) | |
| download | linux-9ca70356a9260403c1bda40d942935e55d00c11c.tar.bz2 | |
Revert "drm: Resurrect atomic rmfb code, v3"
This reverts commit 1592364de3912dad264262f4bcc61552984c9523.
This apparantly causes some regressions so pull it out for now.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_framebuffer.c')
| -rw-r--r-- | drivers/gpu/drm/drm_framebuffer.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c index c0e593a7f9b4..28a0108a1ab8 100644 --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -773,12 +773,6 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) * in this manner. */ if (drm_framebuffer_read_refcount(fb) > 1) { - if (drm_drv_uses_atomic_modeset(dev)) { - int ret = drm_atomic_remove_fb(fb); - WARN(ret, "atomic remove_fb failed with %i\n", ret); - goto out; - } - drm_modeset_lock_all(dev); /* remove from any CRTC */ drm_for_each_crtc(crtc, dev) { @@ -796,7 +790,6 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) drm_modeset_unlock_all(dev); } -out: drm_framebuffer_unreference(fb); } EXPORT_SYMBOL(drm_framebuffer_remove); |