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

Browse source

A resource eviction fix, and a fix for compilation / sparse problems
from the previous pull.

* 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix a couple of compile / sparse warnings and errors
  drm/vmwgfx: Resource evict fixes

...

This commit is contained in:

Dave Airlie 2013-11-14 09:51:43 +10:00

parent cf0613d242 e14cd9536b

commit ca9efa1741

3 changed files with 47 additions and 9 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

7

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

View file

7

drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c

View file

42

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

View file