On Fri, 2006-10-13 at 18:21 -0400, X Strike Force SVN Repository Admin
>
> + * Add 02_radeon_memmap_fbdev.diff. Thanks Michel Dänzer. Closes: #369167
> +
> + -- David Nusinow <[EMAIL PROTECTED]> Fri, 13 Oct 2006 17:50:50 -0400
> +
> xserver-xorg-video-ati (1:6.6.3-1) unstable; urgency=low
>
> * New upstream release
>
> Added:
> 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
> (rev 0)
> +++
> trunk/driver/xserver-xorg-video-ati/debian/patches/02_radeon_memmap_fbdev.diff
> 2006-10-13 22:21:29 UTC (rev 3766)
> @@ -0,0 +1,25 @@
> +Index: 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 @@
> + GDevPtr dev = pEnt->device;
> + unsigned char *RADEONMMIO = info->MMIO;
> + MessageType from = X_PROBED;
> ++ CARD32 accessible, bar_size;
> +
> + if (info->FBDev)
> + pScrn->videoRam = fbdevHWGetVidmem(pScrn) / 1024;
> +@@ -2474,11 +2475,9 @@
> +
> + OUTREG(RADEON_CONFIG_MEMSIZE, pScrn->videoRam * 1024);
> + } else {
> +- CARD32 accessible;
> +- CARD32 bar_size;
> +-
> + /* Read VRAM size from card */
> + pScrn->videoRam = INREG(RADEON_CONFIG_MEMSIZE) / 1024;
> ++ }
> +
> + /* Some production boards of m6 will return 0 if it's 8 MB */
> + if (pScrn->videoRam == 0) {
That's not the patch I pushed upstream as
6671c1b01bf29d8f1cacf9306ef658b967d8a3cf .
--
Earthling Michel Dänzer | http://tungstengraphics.com
Libre software enthusiast | Debian, X and DRI developer
