[PULL vmwgfx-fixes-3.14]

Thomas Hellstrom thellstrom at vmware.com
Wed Feb 5 06:08:34 PST 2014


Dave,

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.

/Thomas

The following changes since commit ef64cf9d06049e4e9df661f3be60b217e476bee1:

  Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next (2014-01-30 10:46:06 +1000)

are available in the git repository at:


  git://people.freedesktop.org/~thomash/linux tags/vmwgfx-fixes-3.14-2014-02-05

for you to fetch changes up to cd9a21a831af0af7539a0e37e4455da03df7cf82:

  vmwgfx: Fix unitialized stack read in vmw_setup_otable_base (2014-02-05 08:52:34 +0100)

----------------------------------------------------------------
Pull request of 2014-02-05

----------------------------------------------------------------
Dave Jones (1):
      vmwgfx: Fix unitialized stack read in vmw_setup_otable_base

Thomas Hellstrom (7):
      drm/vmwgfx: Don't commit staged bindings if execbuf fails
      drm/vmwgfx: Fix regression caused by "drm/ttm: make ttm reservation calls behave like reservation calls"
      drm/vmwgfx: Fix SET_SHADER_CONST emulation on guest-backed devices
      drm/vmwgfx: Fix legacy surface reference size copyback
      drm/vmwgfx: Emulate legacy shaders on guest-backed devices v2
      drm/vmwgfx: Detect old user-space drivers and set up legacy emulation v2
      drm/vmwgfx: Reemit context bindings when necessary v2

 drivers/gpu/drm/vmwgfx/svga3d_reg.h      |   24 ++
 drivers/gpu/drm/vmwgfx/vmwgfx_context.c  |  144 +++++++--
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c      |    7 +
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h      |   35 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c  |  330 ++++++++++++++++++---
 drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c    |   93 +++++-
 drivers/gpu/drm/vmwgfx/vmwgfx_mob.c      |    1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |   11 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_shader.c   |  467 ++++++++++++++++++++++++++----
 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c  |    6 +-
 10 files changed, 988 insertions(+), 130 deletions(-)


More information about the dri-devel mailing list