From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Mar 2014 04:32:16 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: firefly_0821_release~176^2~4288
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c60f7d5a8e7c639de5d9dfe07e1e91d302d506e4;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Pretty minor set of fixes for radeon, ttm and vmwgfx.  The ttm ones
  are a regression and an oops seen on server chipsets"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: Fix a surface reference corner-case in legacy emulation mode
  drm/radeon/cik: properly set compute ring status on disable
  drm/radeon/cik: stop the sdma engines in the enable() function
  drm/radeon/cik: properly set sdma ring status on disable
  drm/radeon: fix runpm disabling on non-PX harder
  drm/ttm: don't oops if no invalidate_caches()
  drm/ttm: Work around performance regression with VM_PFNMAP
---

c60f7d5a8e7c639de5d9dfe07e1e91d302d506e4