Attachment 71356 Details for Bug 57772 – Fix memory detection on P4M800

[patch] Fix memory detection on P4M800

k400.diff (text/plain), 1.30 KB, created by Xavier Bachelot on 2012-12-11 19:33:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Bachelot

Created: 2012-12-11 19:33:46 UTC

Size: 1.30 KB

patch

obsolete

>diff --git a/src/via_ums.c b/src/via_ums.c
>index 053c16b..f661c15 100644
>--- a/src/via_ums.c
>+++ b/src/via_ums.c
>@@ -708,18 +708,21 @@ UMSPreInit(ScrnInfoPtr pScrn)
>             pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10;
>             break;
>         case VIA_KM400:
>+            /* P4M800 */
>+            if (DEVICE(bridge) == 0x0296) {
> #ifdef HAVE_PCIACCESS
>-            pci_device_cfg_read_u8(bridge, &videoRam, 0xE1);
>+                pci_device_cfg_read_u8(vgaDevice, &videoRam, 0xA1);
> #else
>-            videoRam = pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70;
>+                videoRam = pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70;
>+#endif
>+            } else {
>+#ifdef HAVE_PCIACCESS
>+                pci_device_cfg_read_u8(bridge, &videoRam, 0xE1);
>+#else
>+                videoRam = pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70;
> #endif
>-            pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10;
>-	    /* Workaround for #177 (VRAM probing fail on P4M800) */
>-	    if (pScrn->videoRam < 16384) {
>-	        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
>-		           "Memory size detection failed: using 16 MB.\n");
>-		           pScrn->videoRam = 16 << 10;
>             }
>+            pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10;
>             break;
>         case VIA_PM800:
>         case VIA_VM800:

Actions: View | Splinter Review

Attachments on bug 57772: 71356 | 72446 | 72458

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.