[src/trunk]: src/sys/external/bsd/drm2/i915drm Fix WSDISPLAYIO_GET_BUSID on n...

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

details:   https://anonhg.NetBSD.org/src/rev/85d527a02f83
branches:  trunk
changeset: 330878:85d527a02f83
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Jul 24 21:28:44 2014 +0000

description:
Fix WSDISPLAYIO_GET_BUSID on new intelfb(4).

Need to pass the PCI device, not one of its children (which intelfb
is), to wsdisplayio_busid_pci.

Fixes starting X.

diffstat:

 sys/external/bsd/drm2/i915drm/intelfb.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r cc9a9ec75e7b -r 85d527a02f83 sys/external/bsd/drm2/i915drm/intelfb.c
--- a/sys/external/bsd/drm2/i915drm/intelfb.c   Thu Jul 24 21:22:29 2014 +0000
+++ b/sys/external/bsd/drm2/i915drm/intelfb.c   Thu Jul 24 21:28:44 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intelfb.c,v 1.1 2014/07/24 21:18:40 riastradh Exp $    */
+/*     $NetBSD: intelfb.c,v 1.2 2014/07/24 21:28:44 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.1 2014/07/24 21:18:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.2 2014/07/24 21:28:44 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -316,8 +316,8 @@
                return pci_devioctl(pa->pa_pc, pa->pa_tag, cmd, data, flag, l);
 
        case WSDISPLAYIO_GET_BUSID:
-               return wsdisplayio_busid_pci(genfb->sc_dev,
-                   pa->pa_pc, pa->pa_tag, data);
+               return wsdisplayio_busid_pci(dev->dev, pa->pa_pc, pa->pa_tag,
+                   data);
 
        /*
         * Screen blanking ioctls.  Not to be confused with backlight