diff options
author | Thomas Hellstrom | 2019-06-04 13:54:26 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2019-07-14 08:11:09 +0200 |
commit | d3861d4ca94ccb3dd5cb103d951df5584c59c586 (patch) | |
tree | d959e631b953bd4c12fc72563adf7f4643916bc4 /drivers/gpu | |
parent | s390/boot: disable address-of-packed-member warning (diff) | |
download | kernel-qcow2-linux-d3861d4ca94ccb3dd5cb103d951df5584c59c586.tar.gz kernel-qcow2-linux-d3861d4ca94ccb3dd5cb103d951df5584c59c586.tar.xz kernel-qcow2-linux-d3861d4ca94ccb3dd5cb103d951df5584c59c586.zip |
drm/vmwgfx: Honor the sg list segment size limitation
[ Upstream commit bde15555ba61c7f664f40fd3c6fdbdb63f784c9b ]
When building sg tables, honor the device sg list segment size limitation.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Deepak Rawat <drawat@vmware.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c index 31786b200afc..f388ad51e72b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c @@ -448,11 +448,11 @@ static int vmw_ttm_map_dma(struct vmw_ttm_tt *vmw_tt) if (unlikely(ret != 0)) return ret; - ret = sg_alloc_table_from_pages(&vmw_tt->sgt, vsgt->pages, - vsgt->num_pages, 0, - (unsigned long) - vsgt->num_pages << PAGE_SHIFT, - GFP_KERNEL); + ret = __sg_alloc_table_from_pages + (&vmw_tt->sgt, vsgt->pages, vsgt->num_pages, 0, + (unsigned long) vsgt->num_pages << PAGE_SHIFT, + dma_get_max_seg_size(dev_priv->dev->dev), + GFP_KERNEL); if (unlikely(ret != 0)) goto out_sg_alloc_fail; |