Merge branch 'vmwgfx-fixes-5.0-2' of git://people.freedesktop.org/~thomash/linux into drm-fixes

Browse source

A patch set from Christoph for vmwgfx dma mode detection breakage with the
new dma code restructuring in 5.0

A couple of fixes also CC'd stable

Finally an improved IOMMU detection that automatically enables dma mapping
also with other vIOMMUS than the intel one if present and enabled.
Currently trying to start a VM in that case would fail catastrophically.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190206194735.4663-1-thellstrom@vmware.com

...

This commit is contained in:

Dave Airlie 2019-02-07 10:36:43 +10:00

parent 8628752d0c 9ddac734aa

commit 78eb1ca475

3 changed files with 36 additions and 53 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

89

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

View file

2

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

View file

6

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

View file