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

Browse source

Changes for vmwgfx for 4.4. If there is time, I'll follow up with a series
to move to threaded irqs.

* 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Replace iowrite/ioread with volatile memory accesses
  drm/vmwgfx: Turn off support for multisample count != 0 v2
  drm/vmwgfx: switch from ioremap_cache to memremap

...

This commit is contained in:

Dave Airlie 2015-11-03 08:02:44 +10:00

parent a76edb8cec b76ff5ea1c

commit c0f3f90cf4

8 changed files with 140 additions and 101 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

8

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

View file

28

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

View file

24

drivers/gpu/drm/vmwgfx/vmwgfx_fence.c

View file

109

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

View file

38

drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c

View file

9

drivers/gpu/drm/vmwgfx/vmwgfx_irq.c

View file

23

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

View file

2

drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

View file