[git pull] drm fixes

Dave Airlie
2014-03-14T03:57:34Z

Hi Linus,

pretty minor set of fixes for radeon, ttm and vmwgfx,
ttm ones are a regression and an oops seen on server chipsets.

Dave.

The following changes since commit fa389e220254c69ffae0d403eac4146171062d08:

Linux 3.14-rc6 (2014-03-09 19:41:57 -0700)

are available in the git repository at:

git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to f042cc4a607d675452134884c26e8d0d395dd979:

Merge tag 'ttm-fixes-3.14-2014-03-12' of git://people.freedesktop.org/~thomash/linux into drm-fixes (2014-03-13 17:31:24 +1000)

----------------------------------------------------------------

Alex Deucher (4):
drm/radeon: fix runpm disabling on non-PX harder
drm/radeon/cik: properly set sdma ring status on disable
drm/radeon/cik: stop the sdma engines in the enable() function
drm/radeon/cik: properly set compute ring status on disable

Dave Airlie (3):
Merge tag 'vmwgfx-fixes-3.14-2014-03-13' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'ttm-fixes-3.14-2014-03-12' of git://people.freedesktop.org/~thomash/linux into drm-fixes

Rob Clark (1):
drm/ttm: don't oops if no invalidate_caches()

Thomas Hellstrom (2):
drm/ttm: Work around performance regression with VM_PFNMAP
drm/vmwgfx: Fix a surface reference corner-case in legacy emulation mode

drivers/gpu/drm/radeon/cik.c | 5 ++++-
drivers/gpu/drm/radeon/cik_sdma.c | 14 +++++++-------
drivers/gpu/drm/radeon/radeon_kms.c | 10 +++++++++-
drivers/gpu/drm/ttm/ttm_bo.c | 8 +++++---
drivers/gpu/drm/ttm/ttm_bo_vm.c | 12 +++++++-----
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 18 ++++++++++++++++++
6 files changed, 50 insertions(+), 17 deletions(-)