tree 7a06dfa1f7661f8908193f2437b32452520221d3
parent b615b57a124a4af7b68196bc2fb8acc236041fa2
parent 4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd
author Daniel Vetter <daniel.vetter@ffwll.ch> 1336477199 +0200
committer Daniel Vetter <daniel.vetter@ffwll.ch> 1336477199 +0200

Merge remote-tracking branch 'airlied/drm-core-next' into drm-intel-next-queued

Backmerge of drm-next to resolve a few ugly conflicts and to get a few
fixes from 3.4-rc6 (which drm-next has already merged). Note that this
merge also restricts the stencil cache lra evict policy workaround to
snb (as it should) - I had to frob the code anyway because the
CM0_MASK_SHIFT define died in the masked bit cleanups.

We need the backmerge to get Paulo Zanoni's infoframe regression fix
for gm45 - further bugfixes from him touch the same area and would
needlessly conflict.

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>