Module Name: src
Committed By: mrg
Date: Fri May 29 05:48:46 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/radeon: radeon_pci.c
Log Message:
disable drmkms on r100 and most r200. works around PR#49744, etc.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/radeon/radeon_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.9 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.10
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.9 Sun Apr 19 01:08:56 2015
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c Fri May 29 05:48:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pci.c,v 1.9 2015/04/19 01:08:56 mrg Exp $ */
+/* $NetBSD: radeon_pci.c,v 1.10 2015/05/29 05:48:46 mrg 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.9 2015/04/19 01:08:56 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.10 2015/05/29 05:48:46 mrg Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -118,10 +118,14 @@ extern struct drm_driver *const radeon_d
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 @@ radeon_pci_lookup(const struct pci_attac
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;
