diff options
| author | Dave Airlie | 2019-06-21 03:26:59 +0200 |
|---|---|---|
| committer | Dave Airlie | 2019-06-21 03:28:22 +0200 |
| commit | 47e3c4c96460073120577869f17b274264ca9788 (patch) | |
| tree | 27eebc1ff81df8e7a427a7f8c5d8e816f103abaa /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
| parent | Linux 5.2-rc5 (diff) | |
| parent | drm/vmwgfx: fix a warning due to missing dma_parms (diff) | |
| download | kernel-qcow2-linux-47e3c4c96460073120577869f17b274264ca9788.tar.gz kernel-qcow2-linux-47e3c4c96460073120577869f17b274264ca9788.tar.xz kernel-qcow2-linux-47e3c4c96460073120577869f17b274264ca9788.zip | |
Merge branch 'vmwgfx-fixes-5.2' of git://people.freedesktop.org/~thomash/linux into drm-fixes
A couple of fixes for vmwgfx. Two fixes for a DMA sg-list debug warning
message. These are not cc'd stable since there is no evidence of actual
breakage.
On fix for the high-bandwidth backdoor port which is cc'd stable due to
upcoming hardware, on which the code would otherwise break.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <VMware> <thomas@shipmail.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190618072255.2720-1-thomas@shipmail.org
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 4ff11a0077e1..9506190a0300 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -747,6 +747,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); |