Module Name: src
Committed By: christos
Date: Sat Mar 29 19:54:46 UTC 2014
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_irq.c
src/sys/external/bsd/drm2/pci: drm_pci.c
Log Message:
fix pci_intr_string
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/pci/drm_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/drm/dist/bsd-core/drm_irq.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.14 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.15
--- src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.14 Sat Mar 5 16:43:38 2011
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c Sat Mar 29 15:54:46 2014
@@ -186,6 +186,7 @@ int drm_irq_install(struct drm_device *d
#ifdef __NetBSD__
pci_intr_handle_t ih;
const char *istr;
+ char intrbuf[PCI_INTRSTR_LEN];
#endif
if (dev->irq == 0 || dev->dev_private == NULL)
@@ -224,7 +225,7 @@ int drm_irq_install(struct drm_device *d
retcode = ENOENT;
goto err;
}
- istr = pci_intr_string(dev->pa.pa_pc, ih);
+ istr = pci_intr_string(dev->pa.pa_pc, ih, intrbuf, sizeof(intrbuf));
dev->irqh = pci_intr_establish(dev->pa.pa_pc, ih, IPL_TTY,
drm_irq_handler_wrap, dev);
if (!dev->irqh) {
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.2 src/sys/external/bsd/drm2/pci/drm_pci.c:1.3
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.2 Tue Mar 18 14:20:43 2014
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Sat Mar 29 15:54:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.2 2014/03/18 18:20:43 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.3 2014/03/29 19:54:46 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.2 2014/03/18 18:20:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.3 2014/03/29 19:54:46 christos Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -197,11 +197,12 @@ drm_pci_irq_install(struct drm_device *d
pci_intr_handle_t ih;
const char *intrstr;
void *ih_cookie;
+ char intrbuf[PCI_INTRSTR_LEN];
if (pci_intr_map(pa, &ih))
return -ENOENT;
- intrstr = pci_intr_string(pa->pa_pc, ih);
+ intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
ih_cookie = pci_intr_establish(pa->pa_pc, ih, IPL_DRM, handler, arg);
if (ih_cookie == NULL) {
aprint_error_dev(dev->dev,
