From 3d12941b408de7a3bdc579e34e119f8aa81ea926 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 22 Jan 2015 22:28:34 -0800 Subject: [PATCH] drivers/modesetting: Save current BlockHandler on return in msBlockHandler If the BlockHandler chain is modified while it is active, we need to re-fetch the current value and store it in our private for use the next time through. Signed-off-by: Dave Airlie Signed-off-by: Keith Packard --- hw/xfree86/drivers/modesetting/driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index 1cb0c7c6f..d52517d1a 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -538,6 +538,7 @@ msBlockHandler(ScreenPtr pScreen, void *pTimeout, void *pReadmask) pScreen->BlockHandler = ms->BlockHandler; pScreen->BlockHandler(pScreen, pTimeout, pReadmask); + ms->BlockHandler = pScreen->BlockHandler; pScreen->BlockHandler = msBlockHandler; if (pScreen->isGPU) dispatch_slave_dirty(pScreen);