[src/riastradh-drm2]: src/sys/external/bsd/drm2/i915drm Make i915drm_match re...

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

details:   https://anonhg.NetBSD.org/src/rev/064a148921db
branches:  riastradh-drm2
changeset: 788631:064a148921db
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jan 29 19:48:14 2014 +0000

description:
Make i915drm_match return 6 to beat genfb_pci no matter what.

diffstat:

 sys/external/bsd/drm2/i915drm/i915_pci.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 2ed39bf2bb77 -r 064a148921db sys/external/bsd/drm2/i915drm/i915_pci.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci.c  Wed Jan 29 19:47:54 2014 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci.c  Wed Jan 29 19:48:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_pci.c,v 1.1.2.11 2014/01/29 19:47:38 riastradh Exp $      */
+/*     $NetBSD: i915_pci.c,v 1.1.2.12 2014/01/29 19:48:14 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.1.2.11 2014/01/29 19:47:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.1.2.12 2014/01/29 19:48:14 riastradh Exp $");
 
 #include <sys/types.h>
 #ifndef _MODULE
@@ -139,7 +139,10 @@
                return 0;
 #endif
 
-       return (i915drm_pci_lookup(pa) != NULL);
+       if (i915drm_pci_lookup(pa) == NULL)
+               return 0;
+
+       return 6;               /* XXX Beat genfb_pci...  */
 }
 
 static void