]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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


Trivial merge