Merge v5.3-rc1 into drm-misc-next

[tomoyo/tomoyo-test1.git] / drivers / gpu / drm / vmwgfx / vmwgfx_drv.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 275d90f..cd0d49d 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -746,6 +746,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
        if (unlikely(ret != 0))
                goto out_err0;
 
+       dma_set_max_seg_size(dev->dev, min_t(unsigned int, U32_MAX & PAGE_MASK,
+                                            SCATTERLIST_MAX_SEGMENT));
+
        if (dev_priv->capabilities & SVGA_CAP_GMR2) {
                DRM_INFO("Max GMR ids is %u\n",
                         (unsigned)dev_priv->max_gmr_ids);