Merge branch 'drm-radeon-kms' of git://git.kernel.org/pub/scm/linux/kernel/git/airlie...

* 'drm-radeon-kms' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (35 commits)
  drm/radeon: set fb aperture sizes for framebuffer handoff.
  drm/ttm: fix highuser vs dma32 confusion.
  drm/radeon: Fix size used for benchmarking BO copies.
  drm/radeon: Add radeon.test parameter for running BO GPU copy tests.
  drm/radeon/kms: allow interruptible waits for objects.
  drm/ttm: powerpc: Fix Highmem cache flushing.
  x86: Export kmap_atomic_prot() needed for TTM.
  drm/ttm: Fix ttm in-kernel copying of pages with non-standard caching attributes.
  drm/ttm: Fix an oops and sync object leak.
  drm/radeon/kms: vram sizing on certain r100 chips needs workaround.
  drm/radeon: Pay more attention to object placement requested by userspace.
  drm/radeon: Fall back to evicting BOs with memcpy if necessary.
  drm/radeon: Don't unreserve twice on failure to validate.
  drm/radeon/kms: fix bandwidth computation on avivo hardware
  drm/radeon/kms: add initial colortiling support.
  drm/radeon/kms: fix hotspot handling on pre-avivo chips
  drm/radeon/kms: enable frac fb divs on rs600/rs690/rs740
  drm/radeon/kms: add PLL flag to prefer frequencies <= the target freq
  drm/radeon/kms: block RN50 from using 3D engine.
  drm/radeon/kms: fix VRAM sizing like DDX does it.
  ...

diff --combined drivers/gpu/drm/ttm/ttm_bo_vm.c
index fe949a12fe40b4804ebcdd047d7286629d0de51d,41c907f6c560819b7a1ba651c64334cb4014e025..33de7637c0c63766e4ac933ce5aada21b408a641
--- 1/drivers/gpu/drm/ttm/ttm_bo_vm.c
--- 2/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@@ -101,6 -101,9 +101,9 @@@ static int ttm_bo_vm_fault(struct vm_ar
                return VM_FAULT_NOPAGE;
        }
  
+       if (bdev->driver->fault_reserve_notify)
+               bdev->driver->fault_reserve_notify(bo);
+ 
        /*
         * Wait for buffer data in transit, due to a pipelined
         * move.
@@@ -327,7 -330,7 +330,7 @@@ ssize_t ttm_bo_io(struct ttm_bo_device 
                goto out_unref;
  
        kmap_offset = dev_offset - bo->vm_node->start;
 -      if (unlikely(kmap_offset) >= bo->num_pages) {
 +      if (unlikely(kmap_offset >= bo->num_pages)) {
                ret = -EFBIG;
                goto out_unref;
        }
@@@ -401,7 -404,7 +404,7 @@@ ssize_t ttm_bo_fbdev_io(struct ttm_buff
        bool dummy;
  
        kmap_offset = (*f_pos >> PAGE_SHIFT);
 -      if (unlikely(kmap_offset) >= bo->num_pages)
 +      if (unlikely(kmap_offset >= bo->num_pages))
                return -EFBIG;
  
        page_offset = *f_pos & ~PAGE_MASK;