summaryrefslogtreecommitdiff
path: root/hw/xfree86
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2004-08-15 03:34:18 +0000
committerKeith Packard <keithp@keithp.com>2004-08-15 03:34:18 +0000
commit1e728c3e88f6a74b93dc11827c9fcfe7b39ca5a5 (patch)
tree3a63ec7b7c0493ac63cd2b3cd4f13d3071f9f304 /hw/xfree86
parent943308517905d16bda1bb27cd745bd291a84dbf6 (diff)
downloadxserver-1e728c3e88f6a74b93dc11827c9fcfe7b39ca5a5.tar.gz
Copy bits from parent window when allocating pixmaps so that Background ==
None works. Copy filter to backing picture during validation. Mark picture serialNumber when setting Filter or Transform so Validate occurs. Initialize xf86Screens[i]->pScreen to NULL so that RADEON driver doesn't crash during server reset using old pScreen.
Diffstat (limited to 'hw/xfree86')
-rw-r--r--hw/xfree86/common/xf86Init.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index dcb132dbd..9f90c08d8 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -905,6 +905,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
xf86Screens[i]->LoadPalette = NULL;
xf86Screens[i]->SetOverscan = NULL;
xf86Screens[i]->RRFunc = NULL;
+ xf86Screens[i]->pScreen = NULL;
scr_index = AddScreen(xf86Screens[i]->ScreenInit, argc, argv);
if (scr_index == i) {
/*