Module Name: src
Committed By: riastradh
Date: Thu Jul 24 21:28:44 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm: intelfb.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/intelfb.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/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.1 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.2
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.1 Thu Jul 24 21:18:40 2014
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c Thu Jul 24 21:28:44 2014
@@ -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 @@ intelfb_genfb_ioctl(void *v, void *vs, u
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
