Re: kern/51675 (radeondrmkms wedge with supertuxkart)

[David Holland <dholland%netbsd.org@localhost>]

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

From: David Holland <dholland%netbsd.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: kern/51675 (radeondrmkms wedge with supertuxkart)
Date: Fri, 18 Jan 2019 09:07:33 +0000

 On Fri, Jan 18, 2019 at 07:55:56AM +0000, dholland%NetBSD.org@localhost wrote:
  > concur, but they haven't been filed yet
 
 The merge fails on both -8 and -7 because the comment following the
 change is different; the following patch applies (to both), but
 someone who knows more about the code should eyeball the results to
 make sure it's still valid.
 
 Index: drm_pci.c
 ===================================================================
 RCS file: /cvsroot/src/sys/external/bsd/drm2/pci/drm_pci.c,v
 retrieving revision 1.17.2.1
 diff -u -r1.17.2.1 drm_pci.c
 --- drm_pci.c	1 Aug 2017 23:12:06 -0000	1.17.2.1
 +++ drm_pci.c	18 Jan 2019 08:19:17 -0000
 @@ -145,6 +145,14 @@
  			continue;
  		}
  
 +		/*
 +		 * If it's a 64-bit mapping, don't interpret the second
 +		 * half of it as another BAR in the next iteration of
 +		 * the loop -- move on to the next unit.
 +		 */
 +		if (PCI_MAPREG_MEM_TYPE(type) == PCI_MAPREG_MEM_TYPE_64BIT)
 +			unit++;
 +
  		/* Inquire about it.  We'll map it in drm_core_ioremap.  */
  		if (pci_mapreg_info(pa->pa_pc, pa->pa_tag, reg, type,
  			&bm->bm_base, &bm->bm_size, &bm->bm_flags) != 0) {
 
 
 -- 
 David A. Holland
 dholland%netbsd.org@localhost