Attachment 291179 Details for Bug 426743 – X crash on display resolution change request from ppracer startup.

[patch] X crash on display resolution change request from ppracer startup.

savage-2.1.2-error-check.patch (text/plain), 1.58 KB, created by Samo Pogacnik on 2008-01-09 18:24:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samo Pogacnik

Created: 2008-01-09 18:24:26 UTC

Size: 1.58 KB

patch

obsolete

>--- xf86-video-savage-2.1.3.orig/src/savage_driver.c	2008-01-04 19:08:25.000000000 +0100
>+++ xf86-video-savage-2.1.3/src/savage_driver.c	2008-01-04 21:46:01.000000000 +0100
>@@ -2126,6 +2126,9 @@ static Bool SavagePreInit(ScrnInfoPtr pS
>     }
> 
>     xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V);
>+#if 1 /*samo - added*/
>+    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "pScrn=0x%x, pScrn->scrnIndex=%d, pScrn->modes=0x%x, pScrn->currentMode=0x%x\n", pScrn, pScrn->scrnIndex, pScrn->modes, pScrn->currentMode);
>+#endif
>     pScrn->currentMode = pScrn->modes;
>     xf86PrintModes(pScrn);
>     xf86SetDpi(pScrn, 0, 0);
>@@ -4066,6 +4069,11 @@ Bool SavageSwitchMode(int scrnIndex, Dis
>     Bool success;
> 
>     TRACE(("SavageSwitchMode\n"));
>+#if 1 /*samo - added*/
>+    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "pScrn=0x%x, pScrn->scrnIndex=%d, pScrn->modes=0x%x, pScrn->currentMode=0x%x\n", pScrn, pScrn->scrnIndex, pScrn->modes, pScrn->currentMode);
>+    if (!pScrn->currentMode && pScrn->modes)
>+        pScrn->currentMode = pScrn->modes;
>+#endif
> 
>     if (psav->FBStart2nd || (psav->videoFlags & VF_STREAMS_ON))
>         SavageStreamsOff(xf86Screens[scrnIndex]);
>@@ -4081,7 +4089,18 @@ Bool SavageSwitchMode(int scrnIndex, Dis
>         pSavEnt = pPriv->ptr;
>         SavageModeInit(pSavEnt->pSecondaryScrn, pSavEnt->pSecondaryScrn->currentMode);
>     }
>+#if 0 /*samo - orig*/
>+#if 0 /*samo - orig*/
>+    SavagePanningCheck(pScrn);
>+#else
>+    if (success)
>+        SavagePanningCheck(pScrn);
>+#endif
>+#else
>+    if (!pScrn->currentMode)
>+        return FALSE;
>     SavagePanningCheck(pScrn);
>+#endif
> 
>     return success;
> }

Actions: View | Diff

Attachments on bug 426743: 291161 | 291162 | 291163 | 291164 | 291178 | 291179