diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2026-02-05 10:33:06 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2026-02-05 10:33:06 +0100 |
| commit | 2bebc88d5e37ddcb5ea5039a39f39527662b27f0 (patch) | |
| tree | cd7213334fe604969486b693e44750fe19ecd925 /drivers/gpu/drm/xe/xe_dma_buf.c | |
| parent | 96f30ee0fb9db1663eb8fd55c12e4c67da8c4a90 (diff) | |
| parent | 3cc9398a9ea69b77de01b370463b706c354e52fb (diff) | |
| download | linux-next-2bebc88d5e37ddcb5ea5039a39f39527662b27f0.tar.gz linux-next-2bebc88d5e37ddcb5ea5039a39f39527662b27f0.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging to get bug fixes from v6.19-rc7.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_dma_buf.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_dma_buf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/xe/xe_dma_buf.c b/drivers/gpu/drm/xe/xe_dma_buf.c index 4e3a968bc6a0..ea370cd373e9 100644 --- a/drivers/gpu/drm/xe/xe_dma_buf.c +++ b/drivers/gpu/drm/xe/xe_dma_buf.c @@ -120,7 +120,7 @@ static struct sg_table *xe_dma_buf_map(struct dma_buf_attachment *attach, case XE_PL_TT: sgt = drm_prime_pages_to_sg(obj->dev, bo->ttm.ttm->pages, - bo->ttm.ttm->num_pages); + obj->size >> PAGE_SHIFT); if (IS_ERR(sgt)) return sgt; |