diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-11-05 11:25:17 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-11-05 11:25:17 +0300 |
| commit | 5f8f965287494d55e8ba3551e3727a5e9d0eb702 (patch) | |
| tree | 22a814cce4bf9de25a2af9af704da77787ac1e14 /samples/vfio-mdev | |
| parent | ba8a5cb234ba3bf0a585fd38e5f36d7e7ce33661 (diff) | |
| parent | e047c7be173caab95f3876ab30c03ebcf654c300 (diff) | |
| download | linux-5f8f965287494d55e8ba3551e3727a5e9d0eb702.tar.xz | |
Merge drm/drm-next into drm-intel-next-queued
Catch up with v5.10-rc2 and drm-misc-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'samples/vfio-mdev')
| -rw-r--r-- | samples/vfio-mdev/mbochs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c index 3cc5e5921682..e03068917273 100644 --- a/samples/vfio-mdev/mbochs.c +++ b/samples/vfio-mdev/mbochs.c @@ -846,7 +846,7 @@ static struct sg_table *mbochs_map_dmabuf(struct dma_buf_attachment *at, if (sg_alloc_table_from_pages(sg, dmabuf->pages, dmabuf->pagecount, 0, dmabuf->mode.size, GFP_KERNEL) < 0) goto err2; - if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction)) + if (dma_map_sgtable(at->dev, sg, direction, 0)) goto err3; return sg; @@ -868,6 +868,7 @@ static void mbochs_unmap_dmabuf(struct dma_buf_attachment *at, dev_dbg(dev, "%s: %d\n", __func__, dmabuf->id); + dma_unmap_sgtable(at->dev, sg, direction, 0); sg_free_table(sg); kfree(sg); } |