Re: xsrc/42262: Thinkpad T500 Intel GM45 Express X doesn't like i915drm

[Jeremy Morse <jeremy.morse%gmail.com@localhost>]

Jeremy Morse wrote:
>  Hi,
>  
>  After putting some more cycles into this, I think the problem is the
>  same as stated before (can't submap part of agp space), just I've been
>  looking in the wrong place. The attached patch should DTRT, no need to
>  test with the previous two patches.
>  
>  -- 
>  Thanks,
>  Jeremy

<attachment eaten by gmail>

Lemmie try that again from a real mail client; sorry for the extra noise.

-- 
Thanks,
Jeremy

Index: drm_memory.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c,v
retrieving revision 1.3.10.1
diff -u -p -r1.3.10.1 drm_memory.c
--- drm_memory.c        20 Jun 2009 23:36:59 -0000      1.3.10.1
+++ drm_memory.c        18 Nov 2009 06:36:15 -0000
@@ -91,8 +91,9 @@ drm_netbsd_ioremap(struct drm_device *de
                if ((dev->pci_map_data[i].maptype == PCI_MAPREG_TYPE_MEM ||
                     dev->pci_map_data[i].maptype ==
                       (PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT)) &&
-                   dev->pci_map_data[i].base == map->offset             &&
-                   dev->pci_map_data[i].size >= map->size)
+                   map->offset >= dev->pci_map_data[i].base             &&
+                   map->offset + map->size < dev->pci_map_data[i].base +
+                                               dev->pci_map_data[i].size)
                {
                        map->bst = dev->pa.pa_memt;
                        map->cnt = &(dev->pci_map_data[i].mapped);