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
Subject: Re: xsrc/42262: Thinkpad T500 Intel GM45 Express X doesn't like i915drm
Date: Wed, 04 Nov 2009 12:23:45 +0000

 This is a multi-part message in MIME format.
 --------------070501050006040208060603
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Looks like an intel-agp resource conflict - there's a clause in
 drm_netbsd_ioremap to catch one case of this, but not in another
 situation where it can occur. The attached patch might fix this.
 
 -- 
 Thanks,
 Jeremy
 
 --------------070501050006040208060603
 Content-Type: text/plain;
  name="drm.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="drm.diff"
 
 Index: drm_memory.c
 ===================================================================
 RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c,v
 retrieving revision 1.6
 diff -u -p -r1.6 drm_memory.c
 --- drm_memory.c       2 Sep 2009 01:36:41 -0000       1.6
 +++ drm_memory.c       4 Nov 2009 11:32:34 -0000
 @@ -158,6 +158,10 @@ drm_netbsd_ioremap(struct drm_device *de
                                dev->agp_map_data[i].flags, &map->bsh);
                        if (rv) {
                                dev->agp_map_data[i].mapped--;
 +#if NAGP_I810 > 0 /* XXX even more i810 kludge */
 +                              if (agp_i810_borrow(map->offset, &map->bsh))
 +                                      return bus_space_vaddr(map->bst, 
map->bsh);
 +#endif
                                DRM_DEBUG("ioremap: failed to map (%d)\n", rv);
                                return NULL;
                        }
 
 --------------070501050006040208060603--