[packages/X11.git] / XFree86-tdfx-fix-vtswitch-font-corruption.patch

This patch reorders the code in the EnterVT function in the tdfx driver
in an attempt to fix VT switch font corruption problems that are easily
reproduceable, and often reported.  The code is currently untested.  It
may also fix other VTswitch problems as well.

Mike A. Harris <mharris@redhat.com>

--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c.tdfx-fix-vtswitch-font-corruption	Sun Feb  3 08:40:10 2002
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c	Sun Feb  3 08:42:21 2002
@@ -2326,12 +2326,15 @@
   TDFXTRACE("TDFXLeaveVT start\n");
   pScrn = xf86Screens[scrnIndex];
   hwp=VGAHWPTR(pScrn);
-  TDFXRestore(pScrn);
-  vgaHWLock(hwp);
   pScreen = screenInfo.screens[scrnIndex];
+
   pTDFX = TDFXPTR(pScrn);
   pTDFX->sync(pScrn);
+
+  TDFXRestore(pScrn);
+  vgaHWLock(hwp);
   TDFXShutdownFifo(pScreen);
+
 #ifdef XF86DRI
   if (pTDFX->directRenderingEnabled) {
     DRILock(pScreen, 0);
Commit	Line	Data
	1	This patch reorders the code in the EnterVT function in the tdfx driver
	2	in an attempt to fix VT switch font corruption problems that are easily
	3	reproduceable, and often reported. The code is currently untested. It
	4	may also fix other VTswitch problems as well.
	5
	6	Mike A. Harris <mharris@redhat.com>
	7
	8	--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c.tdfx-fix-vtswitch-font-corruption Sun Feb 3 08:40:10 2002
	9	+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c Sun Feb 3 08:42:21 2002
	10	@@ -2326,12 +2326,15 @@
	11	TDFXTRACE("TDFXLeaveVT start\n");
	12	pScrn = xf86Screens[scrnIndex];
	13	hwp=VGAHWPTR(pScrn);
	14	- TDFXRestore(pScrn);
	15	- vgaHWLock(hwp);
	16	pScreen = screenInfo.screens[scrnIndex];
	17	+
	18	pTDFX = TDFXPTR(pScrn);
	19	pTDFX->sync(pScrn);
	20	+
	21	+ TDFXRestore(pScrn);
	22	+ vgaHWLock(hwp);
	23	TDFXShutdownFifo(pScreen);
	24	+
	25	#ifdef XF86DRI
	26	if (pTDFX->directRenderingEnabled) {
	27	DRILock(pScreen, 0);