diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-02-06 12:04:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-02-06 12:04:31 +1000 |
| commit | 9ca5d4b4e1d4416b6d01804be843f8e39845c73d (patch) | |
| tree | da4619d822217c904b9d1064101cfe25ab20518a /drivers/ide/ide-ioctls.c | |
| parent | 9df5a9b02fb59a4148bc93e0d20731c72aaffa5f (diff) | |
| parent | cd9a21a831af0af7539a0e37e4455da03df7cf82 (diff) | |
| download | talos-obmc-linux-9ca5d4b4e1d4416b6d01804be843f8e39845c73d.tar.gz talos-obmc-linux-9ca5d4b4e1d4416b6d01804be843f8e39845c73d.zip | |
Merge tag 'vmwgfx-fixes-3.14-2014-02-05' of git://people.freedesktop.org/~thomash/linux into drm-next
A couple of vmwgfx fixes together with missing bits of legacy device
emulation to facilitate old user-space drivers on new devices.
The shader emulation bits are a bit large, but since they mostly touch the
new device code, regressions are unlikely. I figure the gain of having
this from the start clearly outweighs the risc of adding these bits at
this point.
Pull request of 2014-02-05
* tag 'vmwgfx-fixes-3.14-2014-02-05' of git://people.freedesktop.org/~thomash/linux:
vmwgfx: Fix unitialized stack read in vmw_setup_otable_base
drm/vmwgfx: Reemit context bindings when necessary v2
drm/vmwgfx: Detect old user-space drivers and set up legacy emulation v2
drm/vmwgfx: Emulate legacy shaders on guest-backed devices v2
drm/vmwgfx: Fix legacy surface reference size copyback
drm/vmwgfx: Fix SET_SHADER_CONST emulation on guest-backed devices
drm/vmwgfx: Fix regression caused by "drm/ttm: make ttm reservation calls behave like reservation calls"
drm/vmwgfx: Don't commit staged bindings if execbuf fails
Diffstat (limited to 'drivers/ide/ide-ioctls.c')
0 files changed, 0 insertions, 0 deletions
