From: Dave Airlie Date: Wed, 4 Jun 2014 03:29:13 +0000 (+1000) Subject: Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux... X-Git-Tag: android-x86-4.4-r2~1071^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0a4ae727d6aa459247b027387edb6ff99f657792;p=android-x86%2Fkernel.git Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes The first one is a one liner fixing a stupid typo in the VM handling code and is only relevant if play with one of the VM defines. The other two switches CIK to use the CPDMA instead of the SDMA for buffer moves, as it turned out the SDMA is still sometimes not 100% reliable. * 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux: drm/radeon: use the CP DMA on CIK drm/radeon: sync page table updates drm/radeon: fix vm buffer size estimation --- 0a4ae727d6aa459247b027387edb6ff99f657792