Module Name: src
Committed By: riastradh
Date: Wed Jul 24 04:05:34 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_dma.c
src/sys/external/bsd/drm2/pci [riastradh-drm2]: drm_pci.c
Log Message:
Use PCI_BAR(m), not PCI_MAPREG_START + m, which is wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.22 -r1.1.1.1.2.23 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 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/dist/drm/i915/i915_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.22 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.23
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.22 Wed Jul 24 04:05:18 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Wed Jul 24 04:05:34 2013
@@ -1619,7 +1619,7 @@ int i915_driver_load(struct drm_device *
bus_size_t size;
if (pci_mapreg_info(dev->pdev->pd_pa.pa_pc,
- dev->pdev->pd_pa.pa_tag, (PCI_MAPREG_START + mmio_bar),
+ dev->pdev->pd_pa.pa_tag, PCI_BAR(mmio_bar),
PCI_MAPREG_TYPE_MEM,
&addr, &size, NULL /* XXX flags? */)) {
ret = -EIO; /* XXX */
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.1.2.7 src/sys/external/bsd/drm2/pci/drm_pci.c:1.1.2.8
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.1.2.7 Wed Jul 24 03:58:51 2013
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Wed Jul 24 04:05:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.1.2.7 2013/07/24 03:58:51 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.1.2.8 2013/07/24 04:05:34 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.1.2.7 2013/07/24 03:58:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.1.2.8 2013/07/24 04:05:34 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -114,7 +114,7 @@ drm_pci_attach(device_t self, const stru
KM_SLEEP);
for (unit = 0; unit < dev->bus_nmaps; unit++) {
struct drm_bus_map *const bm = &dev->bus_maps[unit];
- const int reg = (PCI_MAPREG_START + (unit*4));
+ const int reg = PCI_BAR(unit);
const pcireg_t type =
pci_mapreg_type(pa->pa_pc, pa->pa_tag, reg);
