[src/netbsd-7]: src/sys/external/bsd/drm2/radeon Pull up the following revisi...

[sborrill <sborrill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/297deda4ab93
branches:  netbsd-7
changeset: 799394:297deda4ab93
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Tue Jun 02 14:50:50 2015 +0000

description:
Pull up the following revisions(s) (requested by mrg in ticket #818):
        sys/external/bsd/drm2/radeon/radeon_pci.c:      revision 1.10

Disable drmkms on R100 and most R200 cards. Works around PR#49744.

diffstat:

 sys/external/bsd/drm2/radeon/radeon_pci.c |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (45 lines):

diff -r 80e8b3b774a6 -r 297deda4ab93 sys/external/bsd/drm2/radeon/radeon_pci.c
--- a/sys/external/bsd/drm2/radeon/radeon_pci.c Tue Jun 02 10:14:45 2015 +0000
+++ b/sys/external/bsd/drm2/radeon/radeon_pci.c Tue Jun 02 14:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_pci.c,v 1.4.4.2 2015/04/23 07:31:17 snj Exp $   */
+/*     $NetBSD: radeon_pci.c,v 1.4.4.3 2015/06/02 14:50:50 sborrill Exp $      */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.4.4.2 2015/04/23 07:31:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.4.4.3 2015/06/02 14:50:50 sborrill Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -118,10 +118,14 @@
 extern const struct pci_device_id *const radeon_device_ids;
 extern const size_t radeon_n_device_ids;
 
+/* Set this to false if you want to match R100/R200 */
+bool radeon_pci_ignore_r100_r200 = true;
+
 static bool
 radeon_pci_lookup(const struct pci_attach_args *pa, unsigned long *flags)
 {
        size_t i;
+       enum radeon_family fam;
 
        for (i = 0; i < radeon_n_device_ids; i++) {
                if ((PCI_VENDOR(pa->pa_id) == radeon_device_ids[i].vendor) &&
@@ -133,6 +137,11 @@
        if (i == radeon_n_device_ids)
                return false;
 
+       /* NetBSD drm2 fails on R100 and many R200 chipsets, disable for now  */
+       fam = radeon_device_ids[i].driver_data & RADEON_FAMILY_MASK;
+       if (radeon_pci_ignore_r100_r200 && fam < CHIP_RV280)
+               return false;
+
        if (flags)
                *flags = radeon_device_ids[i].driver_data;
        return true;