Attachment 299093 Details for Bug 438947 – patch to fix ia64 map MMIO aperture issue

[patch] patch to fix ia64 map MMIO aperture issue

ia64_map_mmio.patch (text/plain), 1.29 KB, created by Zhan, Yi on 2008-03-26 03:57:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zhan, Yi

Created: 2008-03-26 03:57:34 UTC

Size: 1.29 KB

patch

obsolete

>diff -ruNa xf86-video-ati-6.8.0.orig/src/atividmem.c xf86-video-ati-6.8.0/src/atividmem.c
>--- xf86-video-ati-6.8.0.orig/src/atividmem.c	2007-12-21 07:41:37.000000000 +0800
>+++ xf86-video-ati-6.8.0/src/atividmem.c	2008-03-26 10:34:27.000000000 +0800
>@@ -145,6 +145,14 @@
>     {
> #ifndef XSERVER_LIBPCIACCESS
>         xf86UnMapVidMem(iScreen, pATI->pMMIO, getpagesize());
>+#elif defined(__ia64__)
>+	unsigned long size;
>+
>+	size = PCI_REGION_SIZE(pATI->PCIInfo, 2);
>+	if (!size || size > getpagesize())
>+		size = getpagesize();
>+	
>+	pci_device_unmap_range(pATI->PCIInfo, pATI->pMMIO, size);
> #else
>         pci_device_unmap_range(pATI->PCIInfo, pATI->pMMIO, getpagesize());
> #endif
>@@ -340,11 +348,25 @@
> 
>         int mode = PCI_DEV_MAP_FLAG_WRITABLE;
> 
>+#if defined(__ia64__)
>+	int err;
>+	unsigned long size;
>+	
>+	size = PCI_REGION_SIZE(pVideo, 2);
>+	if (!size || size > PageSize)
>+		size = PageSize;
>+	
>+	err = pci_device_map_range(pVideo,
>+				   MMIOBase,
>+				   size,
>+				   mode, &pATI->pMMIO);
>+#else
>         int err = pci_device_map_range(pVideo,
>                                        MMIOBase,
>                                        PageSize,
>                                        mode, &pATI->pMMIO);
>-
>+#endif	/* __ia64__ */
>+		
>         if (err)
>         {
>             xf86DrvMsg (iScreen, X_ERROR,

Actions: View | Diff

Attachments on bug 438947: 299093