Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:03:02 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux: pci.h
src/sys/external/bsd/drm2/pci: drm_pci.c
Log Message:
Namespace our private fields in Linux struct pci_device.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/drm2/include/linux/pci.h
cvs rdiff -u -r1.20 -r1.21 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/drm2/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.26 src/sys/external/bsd/drm2/include/linux/pci.h:1.27
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.26 Mon Aug 27 06:40:43 2018
+++ src/sys/external/bsd/drm2/include/linux/pci.h Mon Aug 27 07:03:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.26 2018/08/27 06:40:43 riastradh Exp $ */
+/* $NetBSD: pci.h,v 1.27 2018/08/27 07:03:02 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -148,6 +148,9 @@ struct pci_dev {
} pd_resources[PCI_NUM_RESOURCES];
struct pci_conf_state *pd_saved_state;
struct acpi_devnode *pd_ad;
+ pci_intr_handle_t *pd_intr_handles;
+
+ /* Linx API only below */
struct pci_bus *bus;
uint32_t devfn;
uint16_t vendor;
@@ -157,7 +160,6 @@ struct pci_dev {
uint8_t revision;
uint32_t class;
bool msi_enabled;
- pci_intr_handle_t *intr_handles;
};
static inline device_t
@@ -298,7 +300,7 @@ pci_enable_msi(struct pci_dev *pdev)
#ifdef notyet
const struct pci_attach_args *const pa = &pdev->pd_pa;
- if (pci_msi_alloc_exact(pa, &pdev->intr_handles, 1))
+ if (pci_msi_alloc_exact(pa, &pdev->pd_intr_handles, 1))
return -EINVAL;
pdev->msi_enabled = 1;
@@ -313,9 +315,9 @@ pci_disable_msi(struct pci_dev *pdev __u
{
const struct pci_attach_args *const pa = &pdev->pd_pa;
- if (pdev->intr_handles != NULL) {
- pci_intr_release(pa->pa_pc, pdev->intr_handles, 1);
- pdev->intr_handles = NULL;
+ if (pdev->pd_intr_handles != NULL) {
+ pci_intr_release(pa->pa_pc, pdev->pd_intr_handles, 1);
+ pdev->pd_intr_handles = NULL;
}
pdev->msi_enabled = 0;
}
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.20 src/sys/external/bsd/drm2/pci/drm_pci.c:1.21
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.20 Mon Aug 27 06:44:15 2018
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Mon Aug 27 07:03:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.20 2018/08/27 06:44:15 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.21 2018/08/27 07:03:02 riastradh 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.20 2018/08/27 06:44:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.21 2018/08/27 07:03:02 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -242,7 +242,7 @@ drm_pci_irq_install(struct drm_device *d
irq_cookie = kmem_alloc(sizeof(*irq_cookie), KM_SLEEP);
if (dev->pdev->msi_enabled) {
- if (dev->pdev->intr_handles == NULL) {
+ if (dev->pdev->pd_intr_handles == NULL) {
if (pci_msi_alloc_exact(pa, &irq_cookie->intr_handles,
1)) {
aprint_error_dev(dev->dev,
@@ -250,8 +250,8 @@ drm_pci_irq_install(struct drm_device *d
goto error;
}
} else {
- irq_cookie->intr_handles = dev->pdev->intr_handles;
- dev->pdev->intr_handles = NULL;
+ irq_cookie->intr_handles = dev->pdev->pd_intr_handles;
+ dev->pdev->pd_intr_handles = NULL;
}
} else {
if (pci_intx_alloc(pa, &irq_cookie->intr_handles)) {
