Attachment 1519 Details for Bug 2064 – patch 1

[patch] patch 1

1.patch (text/plain), 8.31 KB, created by Alex Deucher on 2004-12-12 11:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2004-12-12 11:20:05 UTC

Size: 8.31 KB

patch

obsolete

>This patch adds the "VGAAccess" option (defaults to NO on PPC and YES on others)
>that disables all legacy VGA stuffs in the driver, since they are causing various
>issues on non-x86 machines.
>
>Index: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
>===================================================================
>--- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c     2004-11-24 08:27:43.000000000 +1100
>+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c  2004-12-05 17:11:57.704394872 +1100
>@@ -171,7 +171,8 @@
>    OPTION_SUBPIXEL_ORDER,
>#endif
>    OPTION_SHOWCACHE,
>-    OPTION_DYNAMIC_CLOCKS
>+    OPTION_DYNAMIC_CLOCKS,
>+    OPTION_VGA_ACCESS,
>} RADEONOpts;
>
>static const OptionInfoRec RADEONOptions[] = {
>@@ -223,6 +224,7 @@
>#endif
>    { OPTION_SHOWCACHE,      "ShowCache",        OPTV_BOOLEAN, {0}, FALSE },
>    { OPTION_DYNAMIC_CLOCKS, "DynamicClocks",    OPTV_BOOLEAN, {0}, FALSE },
>+    { OPTION_VGA_ACCESS,     "VGAAccess",        OPTV_BOOLEAN, {0}, TRUE  },
>    { -1,                    NULL,               OPTV_NONE,    {0}, FALSE }
>};
>
>@@ -4201,15 +4203,6 @@
>       return TRUE;
>    }
>
>-    if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE;
>-    xf86LoaderReqSymLists(vgahwSymbols, NULL);
>-    if (!vgaHWGetHWRec(pScrn)) {
>-       RADEONFreeRec(pScrn);
>-       goto fail2;
>-    }
>-
>-    vgaHWGetIOBase(VGAHWPTR(pScrn));
>-
>    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
>              "PCI bus %d card %d func %d\n",
>              info->PciInfo->bus,
>@@ -4237,6 +4230,32 @@
>    memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions));
>    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options);
>
>+    /* By default, don't do VGA IOs on ppc */
>+#ifdef __powerpc__
>+    info->VGAAccess = FALSE;
>+#else
>+    info->VGAAccess = TRUE;
>+#endif
>+
>+    xf86GetOptValBool(info->Options, OPTION_VGA_ACCESS, &info->VGAAccess);
>+    if (info->VGAAccess) {
>+       if (!xf86LoadSubModule(pScrn, "vgahw"))
>+           info->VGAAccess = FALSE;
>+        else {
>+           xf86LoaderReqSymLists(vgahwSymbols, NULL);
>+            if (!vgaHWGetHWRec(pScrn))
>+               info->VGAAccess = FALSE;
>+       }
>+       if (!info->VGAAccess)
>+           xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Loading VGA module failed,"
>+                      " trying to run without it\n");
>+    } else
>+           xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VGAAccess option set to FALSE,"
>+                      " VGA module load skipped\n");
>+    if (info->VGAAccess)
>+        vgaHWGetIOBase(VGAHWPTR(pScrn));
>+
>+
>    if (!RADEONPreInitWeight(pScrn))
>       goto fail;
>
>@@ -4410,7 +4429,8 @@
>    if (pInt10)
>       xf86FreeInt10(pInt10);
>
>-    vgaHWFreeHWRec(pScrn);
>+    if (info->VGAAccess)
>+           vgaHWFreeHWRec(pScrn);
>
> fail2:
>    if(info->MMIO) RADEONUnmapMMIO(pScrn);
>@@ -5846,7 +5866,6 @@
>    RADEONInfoPtr  info       = RADEONPTR(pScrn);
>    unsigned char *RADEONMMIO = info->MMIO;
>    RADEONSavePtr  save       = &info->SavedReg;
>-    vgaHWPtr       hwp        = VGAHWPTR(pScrn);
>
>    RADEONTRACE(("RADEONSave\n"));
>    if (info->FBDev) {
>@@ -5855,19 +5874,23 @@
>    }
>
>    if (!info->IsSecondary) {
>-       vgaHWUnlock(hwp);
>+        if (info->VGAAccess) {
>+           vgaHWPtr hwp = VGAHWPTR(pScrn);
>+
>+            vgaHWUnlock(hwp);
>#if defined(__powerpc__)
>-       /* temporary hack to prevent crashing on PowerMacs when trying to
>-        * read VGA fonts and colormap, will find a better solution
>-        * in the future
>-        */
>-       vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */
>+           /* temporary hack to prevent crashing on PowerMacs when trying to
>+            * read VGA fonts and colormap, will find a better solution
>+            * in the future. TODO: Check if there's actually some VGA stuff
>+            * setup in the card at all !!
>+            */
>+           vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */
>#else
>-       vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS); /* Save mode
>-                                                      * & fonts & cmap
>-                                                      */
>+           /* Save mode * & fonts & cmap */
>+           vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS);
>#endif
>-       vgaHWLock(hwp);
>+           vgaHWLock(hwp);
>+       }
>       save->dp_datatype      = INREG(RADEON_DP_DATATYPE);
>       save->rbbm_soft_reset  = INREG(RADEON_RBBM_SOFT_RESET);
>       save->clock_cntl_index = INREG(RADEON_CLOCK_CNTL_INDEX);
>@@ -5883,7 +5906,6 @@
>    RADEONInfoPtr  info       = RADEONPTR(pScrn);
>    unsigned char *RADEONMMIO = info->MMIO;
>    RADEONSavePtr  restore    = &info->SavedReg;
>-    vgaHWPtr       hwp        = VGAHWPTR(pScrn);
>
>    RADEONTRACE(("RADEONRestore\n"));
>
>@@ -5925,27 +5947,36 @@
>    usleep(100000);
>#endif
>
>-    if (!info->IsSecondary) {
>-       vgaHWUnlock(hwp);
>+    if (info->VGAAccess) {
>+       vgaHWPtr hwp = VGAHWPTR(pScrn);
>+        if (!info->IsSecondary) {
>+            vgaHWUnlock(hwp);
>#if defined(__powerpc__)
>-       /* Temporary hack to prevent crashing on PowerMacs when trying to
>-        * write VGA fonts, will find a better solution in the future
>-        */
>-       vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
>+           /* Temporary hack to prevent crashing on PowerMacs when trying to
>+            * write VGA fonts, will find a better solution in the future
>+            */
>+           vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
>#else
>-       vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
>+           vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
>#endif
>-       vgaHWLock(hwp);
>-    } else {
>-        RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
>-       ScrnInfoPtr   pScrn0;
>-       vgaHWPtr      hwp0;
>-
>-       pScrn0 = pRADEONEnt->pPrimaryScrn;
>-       hwp0   = VGAHWPTR(pScrn0);
>-       vgaHWUnlock(hwp0);
>-       vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
>-       vgaHWLock(hwp0);
>+           vgaHWLock(hwp);
>+        } else {
>+            RADEONEntPtr  pRADEONEnt = RADEONEntPriv(pScrn);
>+           ScrnInfoPtr   pScrn0 = pRADEONEnt->pPrimaryScrn;
>+            RADEONInfoPtr info0 = RADEONPTR(pScrn0);
>+           vgaHWPtr      hwp0;
>+
>+           if (info0->VGAAccess) {
>+               hwp0 = VGAHWPTR(pScrn0);
>+               vgaHWUnlock(hwp0);
>+#if defined(__powerpc__)
>+               vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE);
>+#else
>+               vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
>+#endif
>+               vgaHWLock(hwp0);
>+           }
>+       }
>    }
>    RADEONUnblank(pScrn);
>
>@@ -7450,7 +7481,7 @@
>       }
>    }
>
>-    if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
>+    if (info->VGAAccess && xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
>       vgaHWFreeHWRec(pScrn);
>    RADEONFreeRec(pScrn);
>}
>Index: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man
>===================================================================
>--- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon.man  2004-12-05 16:12:18.446524776 +1100
>+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man       2004-12-05 16:12:54.912981032 +1100
>@@ -496,6 +496,17 @@
>with this enabled.  The default is
>.B off.
>.TP
>+.BI "Option \*qVGAAccess\*q \*q" boolean \*q
>+Tell the driver if it can do legacy VGA IOs to the card. This is
>+necessary for properly resuming consoles when in VGA text mode, but
>+shouldn't be if the console is using radeonfb or some other graphic
>+mode driver. Some platforms like PowerPC have issues with those, and they aren't
>+necessary unless you have a real text mode in console. The default is
>+.B off
>+on PowerPC and
>+.B on
>+on other architectures.
>+.TP
>
>.SH SEE ALSO
>__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
>Index: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
>===================================================================
>--- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon.h    2004-10-03 10:01:13.000000000 +1000
>+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h 2004-12-05 16:11:25.906512072 +1100
>@@ -615,6 +615,7 @@
>    Bool               AtLeastOneNonClone;
>    int                        MergedFBXDPI, MergedFBYDPI;
>    Bool               NoVirtual;
>+    Bool               VGAAccess;
>
>    /* special handlings for DELL triple-head server */
>    Bool               IsDellServer;

Actions: View | Splinter Review

Attachments on bug 2064: 1519 | 1520 | 1521 | 1522 | 1523 | 1524 | 1525 | 1526 | 1527 | 1528 | 1541 | 1553

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.