diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-30 11:00:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-30 11:00:29 +0000 |
| commit | 63931564c77108f1350ed2537b2ef0b8d9f79cc3 (patch) | |
| tree | d704791d58fff4610b45d2da8ff050f4fcbc7618 /drivers/dma-buf/dma-buf.c | |
| parent | f7e88613fdcbef305e9f46ccd22c362d733bb177 (diff) | |
| parent | 6c6200ffebf9766fd5d9293002298ea371c261c1 (diff) | |
| download | linux-next-pending-fixes.tar.gz linux-next-pending-fixes.zip | |
Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.gitpending-fixes
# Conflicts:
# drivers/gpu/drm/drm_panic.c
Diffstat (limited to 'drivers/dma-buf/dma-buf.c')
| -rw-r--r-- | drivers/dma-buf/dma-buf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 36cdc342627e..0dac2c4fb968 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -904,6 +904,10 @@ static int dma_buf_wrap_sg_table(struct sg_table **sg_table) sg_assign_page(to_sg, NULL); sg_dma_address(to_sg) = sg_dma_address(from_sg); sg_dma_len(to_sg) = sg_dma_len(from_sg); +#ifdef CONFIG_NEED_SG_DMA_FLAGS + /* the flags describe the DMA side, e.g. SG_DMA_BUS_ADDRESS */ + to_sg->dma_flags = from_sg->dma_flags; +#endif to_sg = sg_next(to_sg); } |