Module Name: src
Committed By: riastradh
Date: Sun Sep 8 16:15:17 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/pci [riastradh-drm2]: drm_pci.c
Log Message:
Use the 64-bit PCI DMA tag if available.
Otherwise, it can't handle >32-bit physical addresses, which
uvm_obj_wirepages seems to have a tendency to return.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 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/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.1.2.9 src/sys/external/bsd/drm2/pci/drm_pci.c:1.1.2.10
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.1.2.9 Sun Sep 8 15:46:22 2013
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Sun Sep 8 16:15:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.1.2.9 2013/09/08 15:46:22 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.1.2.10 2013/09/08 16:15:17 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.9 2013/09/08 15:46:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.1.2.10 2013/09/08 16:15:17 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -105,7 +105,8 @@ drm_pci_attach(device_t self, const stru
/* XXX Set the power state to D0? */
dev->bst = pa->pa_memt;
- dev->bus_dmat = pa->pa_dmat; /* XXX dmat64? */
+ /* XXX Let the driver say something about 32-bit vs 64-bit DMA? */
+ dev->bus_dmat = (pci_dma64_available(pa)? pa->pa_dmat64 : pa->pa_dmat);
dev->dmat = dev->bus_dmat;
dev->dmat_subregion_p = false;
