Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Wed, 4 Dec 2013 23:18:25 +0000 (09:18 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 4 Dec 2013 23:18:25 +0000 (09:18 +1000)
commit10c028e94e6e47dca88b33dcc7f9f16651e2cc90
tree40cb756cd7d486a626aa35444a784ce2039b78cb
parent8ecffd7914484b728799dd31968f1339fae91593
parent6a0a7a9ead2aa18c13dd8f76c5849daf7be1f45a
Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes

A couple of fixes. The biggest thing is the DMA buffer accounting that was
incorrect.

* 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Add our connectors to sysfs
  drm/vmwgfx: Fix dma buffer memory size accounting
  drm/vmwgfx: Fix up and comment the dumb buffer implementation
  drm/vmwgfx: Correctly set the enabled state on crtcs