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

Browse source

Two vmwgfx fixes, marked for stable as well

* 'vmwgfx-fixes-3.17' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix a potential infinite spin waiting for fifo idle
  drm/vmwgfx: Fix an incorrect OOM return value

...

This commit is contained in:

Dave Airlie 2014-09-03 13:39:47 +10:00

parent 46712cc959 f01ea0c3d9

commit 0977f90679

2 changed files with 7 additions and 7 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

11

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

View file

3

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

View file