From 210d83ad492f0e91889472eaae549106d9b4ebf5 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 1 Jun 2016 15:07:22 +0200 Subject: [PATCH] modesetting: Set ppix->fb_id to 0 after removing the fb This ensures the fb gets re-added when a shared pixmap is re-used for a second drmmode_set_scanout_pixmap_cpu call. Note currently the xserver never re-uses a shared pixmap in this way, so this is mostly a sanity fix. Signed-off-by: Hans de Goede Reviewed-by: Dave Airlie --- hw/xfree86/drivers/modesetting/drmmode_display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index 04d9df325..e6bc80d24 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -693,6 +693,7 @@ drmmode_set_scanout_pixmap_cpu(xf86CrtcPtr crtc, PixmapPtr ppix) if (crtc->randr_crtc->scanout_pixmap) { ppriv = msGetPixmapPriv(drmmode, crtc->randr_crtc->scanout_pixmap); drmModeRmFB(drmmode->fd, ppriv->fb_id); + ppriv->fb_id = 0; } if (drmmode_crtc->slave_damage) { DamageUnregister(drmmode_crtc->slave_damage);