Attachment 1113 Details for Bug 1569 – p_fixes.diff.new

[patch] p_fixes.diff.new

p_fixes.up (text/plain), 10.09 KB, created by Stefan Dirsch on 2004-10-15 12:52:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2004-10-15 12:52:43 UTC

Size: 10.09 KB

patch

obsolete

>--- programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c	4 Mar 2004 17:47:46 -0000	1.1.4.2.6.1
>+++ programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c	18 Mar 2004 08:31:49 -0000
>@@ -243,7 +243,6 @@
> 
>    pGeode = GEODEPTR(pScreenInfo);
> 
>-   if (!pGeode->NoAccel) {
>       ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>       XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
>       XF86VideoAdaptorPtr newAdaptor = NULL;
>@@ -278,7 +277,6 @@
> 
>       if (newAdaptors)
> 	 xfree(newAdaptors);
>-   }
> }
> 
> /* client libraries expect an encoding */
>@@ -413,17 +411,15 @@
> void
> GX1ResetVideo(ScrnInfoPtr pScrn)
> {
>-   GeodePtr pGeode = GEODEPTR(pScrn);
>+    GeodePtr pGeode = GEODEPTR(pScrn);
> 
>-   if (!pGeode->NoAccel) {
>-      GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr;
>+    GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr;
> 
>-      DEBUGMSG(0, (0, X_NONE, "ResetVideo\n"));
>-      GX1AccelSync(pScrn);
>-      GFX(set_video_palette(NULL));
>-      GX1SetColorkey(pScrn, pPriv);
>-      GFX(set_video_filter(pPriv->filter, pPriv->filter));
>-   }
>+    DEBUGMSG(0, (0, X_NONE, "ResetVideo\n"));
>+    if (!pGeode->NoAccel) GX1AccelSync(pScrn);
>+    GFX(set_video_palette(NULL));
>+    GX1SetColorkey(pScrn, pPriv);
>+    GFX(set_video_filter(pPriv->filter, pPriv->filter));
> }
> 
> /*----------------------------------------------------------------------------
>@@ -537,7 +533,7 @@
>    DEBUGMSG(0, (0, X_NONE, "StopVideo\n"));
>    REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
> 
>-   GX1AccelSync(pScrn);
>+   if (!pGeode->NoAccel) GX1AccelSync(pScrn);
>    if (exit) {
>       if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
> 	 GFX(set_video_enable(0));
>@@ -580,8 +576,9 @@
> 		    Atom attribute, INT32 value, pointer data)
> {
>    GeodePortPrivPtr pPriv = (GeodePortPrivPtr) data;
>+   GeodePtr pGeode = GEODEPTR(pScrn);
> 
>-   GX1AccelSync(pScrn);
>+   if (!pGeode->NoAccel) GX1AccelSync(pScrn);
>    if (attribute == xvColorKey) {
>       pPriv->colorKey = value;
>       GX1SetColorkey(pScrn, pPriv);
>@@ -1002,7 +999,7 @@
>    GeodePtr pGeode = GEODEPTR(pScrn);
> 
>    /*    DisplayModePtr mode = pScrn->currentMode; */
>-   GX1AccelSync(pScrn);
>+   if (!pGeode->NoAccel) GX1AccelSync(pScrn);
> 
>    GFX(set_video_enable(1));
> 
>@@ -1353,7 +1350,7 @@
>    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
>    pScreen->BlockHandler = GX1BlockHandler;
> 
>-   GX1AccelSync(pScrn);
>+   if (!pGeode->NoAccel) GX1AccelSync(pScrn);
>    if (pPriv->videoStatus & TIMER_MASK) {
>       UpdateCurrentTime();
>       if (pPriv->videoStatus & OFF_TIMER) {
>--- programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c	4 Mar 2004 17:47:46 -0000	1.1.4.2.6.1
>+++ programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c	18 Mar 2004 08:31:49 -0000
>@@ -233,46 +233,44 @@
> void
> GX2InitVideo(ScreenPtr pScreen)
> {
>-   GeodePtr pGeode;
>-   ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
>+    GeodePtr pGeode;
>+    ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
> 
>-   pGeode = GEODEPTR(pScreenInfo);
>+    pGeode = GEODEPTR(pScreenInfo);
> 
>-   if (!pGeode->NoAccel) {
>-      ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>-      XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
>-      XF86VideoAdaptorPtr newAdaptor = NULL;
>+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>+    XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
>+    XF86VideoAdaptorPtr newAdaptor = NULL;
> 
>-      int num_adaptors;
>+    int num_adaptors;
> 
>-      newAdaptor = GX2SetupImageVideo(pScreen);
>-      GX2InitOffscreenImages(pScreen);
>+    newAdaptor = GX2SetupImageVideo(pScreen);
>+    GX2InitOffscreenImages(pScreen);
> 
>-      num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
>+    num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
> 
>-      if (newAdaptor) {
>-	 if (!num_adaptors) {
>+    if (newAdaptor) {
>+	if (!num_adaptors) {
> 	    num_adaptors = 1;
> 	    adaptors = &newAdaptor;
>-	 } else {
>+	} else {
> 	    newAdaptors =		/* need to free this someplace */
>-		  xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
>+		xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
> 	    if (newAdaptors) {
>-	       memcpy(newAdaptors, adaptors, num_adaptors *
>-		      sizeof(XF86VideoAdaptorPtr));
>-	       newAdaptors[num_adaptors] = newAdaptor;
>-	       adaptors = newAdaptors;
>-	       num_adaptors++;
>+		memcpy(newAdaptors, adaptors, num_adaptors *
>+		       sizeof(XF86VideoAdaptorPtr));
>+		newAdaptors[num_adaptors] = newAdaptor;
>+		adaptors = newAdaptors;
>+		num_adaptors++;
> 	    }
>-	 }
>-      }
>+	}
>+    }
> 
>-      if (num_adaptors)
>-	 xf86XVScreenInit(pScreen, adaptors, num_adaptors);
>+    if (num_adaptors)
>+	xf86XVScreenInit(pScreen, adaptors, num_adaptors);
> 
>-      if (newAdaptors)
>-	 xfree(newAdaptors);
>-   }
>+    if (newAdaptors)
>+	xfree(newAdaptors);
> }
> 
> /* client libraries expect an encoding */
>@@ -416,16 +414,14 @@
> void
> GX2ResetVideo(ScrnInfoPtr pScrn)
> {
>-   GeodePtr pGeode = GEODEPTR(pScrn);
>+    GeodePtr pGeode = GEODEPTR(pScrn);
> 
>-   if (!pGeode->NoAccel) {
>-      GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr;
>+    GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr;
> 
>-      GX2AccelSync(pScrn);
>-      GFX(set_video_palette(NULL));
>-      GX2SetColorkey(pScrn, pPriv);
>-      GFX(set_video_filter(pPriv->filter, pPriv->filter));
>-   }
>+    if (!pGeode->NoAccel) GX2AccelSync(pScrn);
>+    GFX(set_video_palette(NULL));
>+    GX2SetColorkey(pScrn, pPriv);
>+    GFX(set_video_filter(pPriv->filter, pPriv->filter));
> }
> 
> /*----------------------------------------------------------------------------
>@@ -537,7 +533,7 @@
> 
>    REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
> 
>-   GX2AccelSync(pScrn);
>+   if (!pGeode->NoAccel) GX2AccelSync(pScrn);
>    if (exit) {
>       if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
> 	 GFX(set_video_enable(0));
>@@ -580,8 +576,9 @@
> 		    Atom attribute, INT32 value, pointer data)
> {
>    GeodePortPrivPtr pPriv = (GeodePortPrivPtr) data;
>+   GeodePtr pGeode = GEODEPTR(pScrn);
> 
>-   GX2AccelSync(pScrn);
>+   if (!pGeode->NoAccel) GX2AccelSync(pScrn);
>    if (attribute == xvColorKey) {
>       pPriv->colorKey = value;
>       GX2SetColorkey(pScrn, pPriv);
>@@ -941,7 +938,7 @@
> {
>    GeodePtr pGeode = GEODEPTR(pScrn);
> 
>-   GX2AccelSync(pScrn);
>+   if (!pGeode->NoAccel) GX2AccelSync(pScrn);
> 
>    GFX(set_video_enable(1));
> 
>@@ -1298,7 +1295,7 @@
>    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
>    pScreen->BlockHandler = GX2BlockHandler;
> 
>-   GX2AccelSync(pScrn);
>+   if (!pGeode->NoAccel) GX2AccelSync(pScrn);
>    if (pPriv->videoStatus & TIMER_MASK) {
>       UpdateCurrentTime();
>       if (pPriv->videoStatus & OFF_TIMER) {
>diff -u -r -N ../xc.old/config/cf/xfree86.cf ./config/cf/xfree86.cf
>--- ../xc.old/config/cf/xfree86.cf	2003-10-27 16:30:28.000000000 +0100
>+++ ./config/cf/xfree86.cf	2003-10-27 16:32:07.000000000 +0100
>@@ -467,14 +467,24 @@
> 
> # define AgpGartDrivers	/**/
> 
>-# define DevelDrivers		/**/
>+/*
>+ * Drivers under development, but not ready for binary releases, or
>+ * drivers included on this platform only for build testing.
>+ */
>+# ifndef DevelDrivers
>+#  if XFree86Devel
>+#   define DevelDrivers         /**/
>+#  else
>+#   define DevelDrivers         /**/
>+#  endif
>+# endif
> 
> /* Pure PCI drivers should go first */
> # ifndef XF86CardDrivers
> #  define XF86CardDrivers	mga glint nv tga s3 s3virge sis rendition \
> 				neomagic tdfx savage cirrus tseng trident \
> 				chips apm i128 ati ark cyrix siliconmotion \
>-				vga dummy fbdev vesa
>+				vga dummy fbdev vesa i810 DevelDrivers
> # endif
> 
> /* DRI tdfx driver needs Glide, which is not available for AMD64 */
>--- programs/xkbcomp/rules/Imakefile.old	2004-04-15 02:05:24.162324017 +0000
>+++ programs/xkbcomp/rules/Imakefile	2004-04-15 02:08:28.885085701 +0000
>@@ -10,4 +10,6 @@
> InstallMultiple($(LISTFILES),$(LIBDIR)/xkb/rules)
> InstallCreateLink($(LIBDIR)/xkb/rules,xorg,xfree86)
> InstallCreateLink($(LIBDIR)/xkb/rules,xorg.lst,xfree86.lst)
>+InstallCreateLink($(LIBDIR)/xkb/rules,xorg-it.lst,xfree86-it.lst)
>+InstallCreateLink($(LIBDIR)/xkb/rules,xorg.xml,xfree86.xml)
> DependTarget()
>diff -u -r programs/Xserver/hw/xfree86.old/drivers/ati/atiprobe.c programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
>--- programs/Xserver/hw/xfree86.old/drivers/ati/atiprobe.c	2003-10-28 11:30:22.000000000 +0100
>+++ programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c	2003-10-28 11:30:55.000000000 +0100
>@@ -1566,6 +1566,8 @@
>                     continue;
> 
>                 pPCI = pVideo->thisCard;
>+		if (pPCI == NULL)
>+		    continue;
>                 PciReg = pciReadLong(pPCI->tag, PCI_REG_USERCONFIG);
>                 j = PciReg & 0x03U;
>                 if (j == 0x03U)
>diff -c -r3.45 -r3.46
>*** programs/Xserver/os/WaitFor.c 2004/03/17 23:53:033.45
>--- programs/Xserver/os/WaitFor.c 2004/04/07 02:36:263.46
>--- 697,716 ----
>       if (DPMSStandbyTime > 0) {
>           DPMSStandbyTimer = TimerSet(DPMSStandbyTimer, 0, DPMSStandbyTime,
>                                       DPMSStandbyTimerExpire, NULL);
>+     } else if (DPMSStandbyTimer) {
>+ TimerCancel(DPMSStandbyTimer);
>       }
>       if (DPMSSuspendTime > 0) {
>           DPMSSuspendTimer = TimerSet(DPMSSuspendTimer, 0, DPMSSuspendTime,
>                                       DPMSSuspendTimerExpire, NULL);
>+     } else if (DPMSSuspendTimer) {
>+ TimerCancel(DPMSSuspendTimer);
>       }
>       if (DPMSOffTime > 0) {
>           DPMSOffTimer = TimerSet(DPMSOffTimer, 0, DPMSOffTime,
>                                   DPMSOffTimerExpire, NULL);
>+     } else if (DPMSOffTimer) {
>+ TimerCancel(DPMSOffTimer);
>       }
>   }
>   #endif
>diff -u -r -N ../xc.old/nls/compose.dir ./nls/compose.dir
>--- ../xc.old/nls/compose.dir	2003-10-27 16:30:23.000000000 +0100
>+++ ./nls/compose.dir	2003-10-27 16:32:16.000000000 +0100
>@@ -306,8 +306,10 @@
> en_US.UTF-8/Compose:		it_CH.UTF-8
> en_US.UTF-8/Compose:		it_IT.UTF-8
> en_US.UTF-8/Compose:		iu_CA.UTF-8
>+en_US.UTF-8/Compose:		ja_JP.UTF-8
> en_US.UTF-8/Compose:		ka_GE.UTF-8
> en_US.UTF-8/Compose:		kl_GL.UTF-8
>+en_US.UTF-8/Compose:		ko_KR.UTF-8
> en_US.UTF-8/Compose:		kw_GB.UTF-8
> en_US.UTF-8/Compose:		lo_LA.UTF-8
> en_US.UTF-8/Compose:		lt_LT.UTF-8
>@@ -348,3 +350,4 @@
> en_US.UTF-8/Compose:		vi_VN.UTF-8
> en_US.UTF-8/Compose:		wa_BE.UTF-8
> en_US.UTF-8/Compose:		yi_US.UTF-8
>+en_US.UTF-8/Compose:		zh_TW.UTF-8

Actions: View | Splinter Review

Attachments on bug 1569: 1047 | 1113

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.