tree 4cf36c62b7a7b6c6a2ad66e4d79d3f5912a3438b
parent 69163ea82732894e8c1e17df4010372ed078efdd
parent 5ff91e442652ec33a648c3b9ae5025faaff1e813
author Dave Airlie <airlied@redhat.com> 1372985733 +1000
committer Dave Airlie <airlied@redhat.com> 1372985733 +1000

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

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.