Merge branch 'server-fixes' into drm-next

Browse source

Merge the fixes for the server driver dirty update paths
* server-fixes:
  drm/cirrus: deal with bo reserve fail in dirty update path
  drm/ast: deal with bo reserve fail in dirty update path
  drm/mgag200: deal with bo reserve fail in dirty update path

...

This commit is contained in:

Dave Airlie 2013-05-03 10:13:08 +10:00

parent 7e17fc0b69 f3b2bbdc8a

commit d2dbaaf626

9 changed files with 127 additions and 11 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

2

drivers/gpu/drm/ast/ast_drv.h

View file

43

drivers/gpu/drm/ast/ast_fb.c

View file

2

drivers/gpu/drm/ast/ast_ttm.c

View file

2

drivers/gpu/drm/cirrus/cirrus_drv.h

View file

38

drivers/gpu/drm/cirrus/cirrus_fbdev.c

View file

2

drivers/gpu/drm/cirrus/cirrus_ttm.c

View file

2

drivers/gpu/drm/mgag200/mgag200_drv.h

View file

43

drivers/gpu/drm/mgag200/mgag200_fb.c

View file

4

drivers/gpu/drm/mgag200/mgag200_ttm.c

View file