Stephane Marchesin wrote:

Hi,

I upgraded drm (non core) to current cvs (previous one was from 2004-07-15) on an ia64 with a radeon 7000 (pci) and now on inserting the module I get :
[drm:radeon_ati_pcigart_cleanup] *ERROR* no scatter/gather memory!
[drm:radeon_do_cleanup_cp] *ERROR* failed to cleanup PCI GART!

Ok, it looks like drm cvs (core and non core) has been broken on ia64 since august. Patch attached.


Stephane

Index: linux/drm_bufs.h
===================================================================
RCS file: /cvs/dri/drm/linux/drm_bufs.h,v
retrieving revision 1.45
diff -u -r1.45 drm_bufs.h
--- linux/drm_bufs.h    16 Jan 2005 05:40:12 -0000      1.45
+++ linux/drm_bufs.h    4 Mar 2005 14:10:26 -0000
@@ -74,7 +74,7 @@
 
        if ( (offset & (~PAGE_MASK)) || (size & (~PAGE_MASK)) )
                return -EINVAL;
-#if !defined(__sparc__) && !defined(__alpha__)
+#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__)
        if ( offset + size < offset || offset < virt_to_phys(high_memory) )
                return -EINVAL;
 #endif
Index: linux-core/drm_bufs.c
===================================================================
RCS file: /cvs/dri/drm/linux-core/drm_bufs.c,v
retrieving revision 1.54
diff -u -r1.54 drm_bufs.c
--- linux-core/drm_bufs.c       5 Feb 2005 08:00:14 -0000       1.54
+++ linux-core/drm_bufs.c       4 Mar 2005 14:10:27 -0000
@@ -63,7 +63,7 @@
 
        if ((offset & (~PAGE_MASK)) || (size & (~PAGE_MASK)))
                return -EINVAL;
-#if !defined(__sparc__) && !defined(__alpha__)
+#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__)
        if (offset + size < offset || offset < virt_to_phys(high_memory))
                return -EINVAL;
 #endif

Reply via email to