From: Dave Airlie Date: Tue, 14 Jan 2014 00:46:19 +0000 (+1000) Subject: Merge tag 'ttm-next-2014-01-13' of git://people.freedesktop.org/~thomash/linux into... X-Git-Tag: MMI-PSA29.97-13-9~12830^2~38 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a095c60bd06f204c98527aafd5fda6ef42b53eb5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'ttm-next-2014-01-13' of git://people.freedesktop.org/~thomash/linux into drm-next Some code cleanup by Rashika Keria, VM stuff for ttm: -Use PFNMAP instead of MIXEDMAP where possible for performance -Refuse to fault imported pages, an initial step to support dma-bufs better from within TTM. -Correctly set page mapping and -index members. These are needed in various places in the vm subsystem that we are not using yet, but plan to use soonish: For example unmap-mapping-range keeping COW pages, and dirty tracking fbdefio style, but also for PCI memory. ttm-next 2013-01-14 pull request * tag 'ttm-next-2014-01-13' of git://people.freedesktop.org/~thomash/linux: drivers: gpu: Remove unused function in ttm_lock.c drivers: gpu: Mark function as static in ttm_bo_util.c drivers: gpu: Mark function as static in ttm_bo.c drm/ttm: Correctly set page mapping and -index members drm/ttm: Refuse to fault (prime-) imported pages drm/ttm: Use VM_PFNMAP for shared bo maps --- a095c60bd06f204c98527aafd5fda6ef42b53eb5