From: Dave Airlie Date: Thu, 21 Aug 2014 21:29:25 +0000 (+1000) Subject: Merge branch 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c3735aeb657c18200b5d67bd3306cddcac1a71c8;p=linux-beck.git Merge branch 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux more radeon fixes * 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux: Revert "drm/radeon: Use write-combined CPU mappings of ring buffers with PCIe" drm/radeon: fix active_cu mask on SI and CIK after re-init (v3) drm/radeon: fix active cu count for SI and CIK drm/radeon: re-enable selective GPUVM flushing drm/radeon: Sync ME and PFP after CP semaphore waits v4 drm/radeon: fix display handling in radeon_gpu_reset drm/radeon: fix pm handling in radeon_gpu_reset drm/radeon: Only flush HDP cache for indirect buffers from userspace drm/radeon: properly document reloc priority mask --- c3735aeb657c18200b5d67bd3306cddcac1a71c8