summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjah <jah@FreeBSD.org>2015-03-22 18:32:37 +0000
committerjah <jah@FreeBSD.org>2015-03-22 18:32:37 +0000
commitcc715d0ecb062192f215b24e92b98fb56e7a9c97 (patch)
tree5d1d3722d48685e572e8c48ada0ec4eb0dc34d78
parent845bbce4164bf521d30180ac207508e212e8b5b8 (diff)
downloadFreeBSD-src-cc715d0ecb062192f215b24e92b98fb56e7a9c97.zip
FreeBSD-src-cc715d0ecb062192f215b24e92b98fb56e7a9c97.tar.gz
MFC r279919: Using parent DMA tag in drm_pci_alloc(). This can allow
drm2 devices to work with Intel DMAR enabled for the system, as long as DMAR is disabled for the drm2 device. Reviewed by: kib (mentor)
-rw-r--r--sys/dev/drm2/drm_pci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/drm2/drm_pci.c b/sys/dev/drm2/drm_pci.c
index ac9d4e6..5ca151c 100644
--- a/sys/dev/drm2/drm_pci.c
+++ b/sys/dev/drm2/drm_pci.c
@@ -76,7 +76,9 @@ drm_pci_alloc(struct drm_device *dev, size_t size,
if (mtx_owned(&dev->dma_lock))
DRM_ERROR("called while holding dma_lock\n");
- ret = bus_dma_tag_create(NULL, align, 0, /* tag, align, boundary */
+ ret = bus_dma_tag_create(
+ bus_get_dma_tag(dev->device), /* parent */
+ align, 0, /* align, boundary */
maxaddr, BUS_SPACE_MAXADDR, /* lowaddr, highaddr */
NULL, NULL, /* filtfunc, filtfuncargs */
size, 1, size, /* maxsize, nsegs, maxsegsize */
OpenPOWER on IntegriCloud