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

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

The following reply was made to PR xsrc/42262; it has been noted by GNATS.

From: Jeremy Morse <jeremy.morse%gmail.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: xsrc-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, 
 netbsd-bugs%netbsd.org@localhost, spz%serpens.de@localhost
Subject: Re: xsrc/42262: Thinkpad T500 Intel GM45 Express X doesn't like 
 i915drm
Date: Wed, 18 Nov 2009 07:08:42 +0000

 This is a multi-part message in MIME format.
 --------------090005000306030009000000
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 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
 
 --------------090005000306030009000000
 Content-Type: text/plain;
  name="drm3.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="drm3.diff"
 
 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);
 
 --------------090005000306030009000000--