Author: dnusinow
Date: 2006-10-14 11:34:47 -0400 (Sat, 14 Oct 2006)
New Revision: 3779
Modified:
trunk/driver/xserver-xorg-video-ati/debian/patches/02_radeon_memmap_fbdev.diff
trunk/driver/xserver-xorg-video-ati/debian/patches/series
Log:
Fix the previously committed patch
Modified:
trunk/driver/xserver-xorg-video-ati/debian/patches/02_radeon_memmap_fbdev.diff
===================================================================
---
trunk/driver/xserver-xorg-video-ati/debian/patches/02_radeon_memmap_fbdev.diff
2006-10-14 15:32:54 UTC (rev 3778)
+++
trunk/driver/xserver-xorg-video-ati/debian/patches/02_radeon_memmap_fbdev.diff
2006-10-14 15:34:47 UTC (rev 3779)
@@ -1,8 +1,8 @@
-Index: src/radeon_driver.c
+Index: xserver-xorg-video-ati/src/radeon_driver.c
===================================================================
---- src/radeon_driver.c.orig 2006-10-03 10:49:31.000000000 -0400
-+++ src/radeon_driver.c 2006-10-13 17:50:41.000000000 -0400
-@@ -2461,6 +2461,7 @@
+--- xserver-xorg-video-ati.orig/src/radeon_driver.c 2006-10-13
17:50:48.000000000 -0400
++++ xserver-xorg-video-ati/src/radeon_driver.c 2006-10-14 10:35:54.000000000
-0400
+@@ -2461,12 +2461,11 @@
GDevPtr dev = pEnt->device;
unsigned char *RADEONMMIO = info->MMIO;
MessageType from = X_PROBED;
@@ -10,8 +10,15 @@
if (info->FBDev)
pScrn->videoRam = fbdevHWGetVidmem(pScrn) / 1024;
-@@ -2474,11 +2475,9 @@
+- else if ((info->ChipFamily == CHIP_FAMILY_RS100) ||
+- (info->ChipFamily == CHIP_FAMILY_RS200) ||
+- (info->ChipFamily == CHIP_FAMILY_RS300)) {
++ else if ((info->IsIGP)) {
+ CARD32 tom = INREG(RADEON_NB_TOM);
+ pScrn->videoRam = (((tom >> 16) -
+@@ -2474,9 +2473,6 @@
+
OUTREG(RADEON_CONFIG_MEMSIZE, pScrn->videoRam * 1024);
} else {
- CARD32 accessible;
@@ -19,7 +26,42 @@
-
/* Read VRAM size from card */
pScrn->videoRam = INREG(RADEON_CONFIG_MEMSIZE) / 1024;
+
+@@ -2485,24 +2481,23 @@
+ pScrn->videoRam = 8192;
+ OUTREG(RADEON_CONFIG_MEMSIZE, 0x800000);
+ }
+ }
- /* Some production boards of m6 will return 0 if it's 8 MB */
- if (pScrn->videoRam == 0) {
+- /* Get accessible memory */
+- accessible = RADEONGetAccessibleVRAM(pScrn);
++ /* Get accessible memory */
++ accessible = RADEONGetAccessibleVRAM(pScrn);
+
+- /* Crop it to the size of the PCI BAR */
+- bar_size = (1ul << info->PciInfo->size[0]) / 1024;
+- if (bar_size == 0)
+- bar_size = 0x20000;
+- if (accessible > bar_size)
+- accessible = bar_size;
++ /* Crop it to the size of the PCI BAR */
++ bar_size = (1ul << info->PciInfo->size[0]) / 1024;
++ if (bar_size == 0)
++ bar_size = 0x20000;
++ if (accessible > bar_size)
++ accessible = bar_size;
+
+- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+- "Detected total video RAM=%dK, accessible=%ldK "
+- "(PCI BAR=%ldK)\n",
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++ "Detected total video RAM=%dK, accessible=%ldK (PCI BAR=%ldK)\n",
+ pScrn->videoRam, accessible, bar_size);
+- if (pScrn->videoRam > accessible)
+- pScrn->videoRam = accessible;
+- }
++ if (pScrn->videoRam > accessible)
++ pScrn->videoRam = accessible;
+
+ info->MemCntl = INREG(RADEON_SDRAM_MODE_REG);
+ info->BusCntl = INREG(RADEON_BUS_CNTL);
Modified: trunk/driver/xserver-xorg-video-ati/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-video-ati/debian/patches/series 2006-10-14
15:32:54 UTC (rev 3778)
+++ trunk/driver/xserver-xorg-video-ati/debian/patches/series 2006-10-14
15:34:47 UTC (rev 3779)
@@ -1,2 +1,2 @@
01_ati_r128_update_chip_identification.diff
-02_radeon_memmap_fbdev.diff -p0
+02_radeon_memmap_fbdev.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
