commit | d5b75dc01fa9c699aee5f82f5dbe508da438ff94 | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Wed Dec 03 19:35:05 2014 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Wed Dec 03 19:35:05 2014 +1000 |
tree | a9eca99789d07574a82f03647e73d3e64c7e1ef3 | |
parent | 4fcd01d0f34645710ac92d5523e26019428b0806 [diff] | |
parent | b8ccd1e490de8d9b9a968f859c003a10882ad8c8 [diff] |
Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next some vmware fixes. * 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux: drm/vmwgfx: (Re)bind shaders to MOBs with the correct offset drm/vmwgfx: Fix fence event code drm/vmwgfx: Don't use memory accounting for kernel-side fence objects drm/vmwgfx: Fix error printout on signals pending