]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'qxl-next' of git://people.freedesktop.org/~airlied/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Fri, 5 Jul 2013 00:55:33 +0000 (10:55 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 5 Jul 2013 00:55:33 +0000 (10:55 +1000)
Adds 3 features that UMS had to the KMS driver.
dynamic resizing - resizing remote-viewer makes guest resize
multiple crtcs - remote-viewer can access > 1 crtc.
suspend/resume/hibernate: guests can do suspend/resume/hibernate now.

* 'qxl-next' of git://people.freedesktop.org/~airlied/linux:
  qxl: use drm helper hotplug support
  qxl: add suspend/resume/hibernate support.
  qxl: add fb and ttm entry points for use by suspend/resume.
  qxl: add ring prep code for s/r
  qxl: prepare memslot code for suspend/resume
  qxl: split monitors_config object creation out.
  drm/qxl: set time on drawables from userspace
  drm/qxl: add support for > 1 output
  drm/qxl: make dynamic resizing work properly.


Trivial merge