diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-06-06 11:56:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-06-06 11:57:13 +1000 |
| commit | dbd9f78ed23746e9708f773224eec2c8b33206e7 (patch) | |
| tree | c3402e3caf21d9636f3d241d819b536adb0fd735 /drivers/dma-buf | |
| parent | Merge branch 'drm-fixes-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (diff) | |
| parent | udmabuf: actually unmap the scatterlist (diff) | |
| download | linux-dev-dbd9f78ed23746e9708f773224eec2c8b33206e7.tar.xz linux-dev-dbd9f78ed23746e9708f773224eec2c8b33206e7.zip | |
Merge tag 'drm-misc-fixes-2019-06-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
- Allow fb changes in async commits (fixes igt failures) (Helen)
- Actually unmap the scatterlist when unmapping udmabuf (Lucas)
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190605210335.GA35431@art_vandelay
Diffstat (limited to 'drivers/dma-buf')
| -rw-r--r-- | drivers/dma-buf/udmabuf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index cd57747286f2..9635897458a0 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -77,6 +77,7 @@ static void unmap_udmabuf(struct dma_buf_attachment *at, struct sg_table *sg, enum dma_data_direction direction) { + dma_unmap_sg(at->dev, sg->sgl, sg->nents, direction); sg_free_table(sg); kfree(sg); } |