| commit | 10c028e94e6e47dca88b33dcc7f9f16651e2cc90 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Dec 05 09:18:25 2013 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Dec 05 09:18:25 2013 +1000 |
| tree | 40cb756cd7d486a626aa35444a784ce2039b78cb | |
| parent | 8ecffd7914484b728799dd31968f1339fae91593 [diff] | |
| parent | 6a0a7a9ead2aa18c13dd8f76c5849daf7be1f45a [diff] |
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