• Dave Airlie's avatar
    Merge branch 'drm-next-3.9' of git://people.freedesktop.org/~agd5f/linux into drm-next · 73ccd696
    Dave Airlie authored
    Alex writes:
    - CS ioctl cleanup and unification.  Unification of a lot of functionality
    that was duplicated across multiple generates of hardware.
    - Add support for Oland GPUs
    - Deprecate UMS support.  Mesa and the ddx dropped support for UMS and
    apparently very few people still use it since the UMS CS ioctl was broken
    for several kernels and no one reported it.  It was fixed in 3.8/stable.
    - Rework GPU reset.  Use the status registers to determine what blocks
    to reset.  This better matches the recommended reset programming model.
    This also allows us to properly reset blocks besides GFX and DMA.
    - Switch the VM set page code to use an IB rather than the ring.  This
    fixes overflow issues when doing large page table updates using a small
    ring like DMA.
    - Several small cleanups and bug fixes.
    
    * 'drm-next-3.9' of git://people.freedesktop.org/~agd5f/linux: (38 commits)
      drm/radeon/dce6: fix display powergating
      drm/radeon: add Oland pci ids
      drm/radeon: radeon-asic updates for Oland
      drm/radeon: add ucode loading support for Oland
      drm/radeon: fill in gpu init for Oland
      drm/radeon: add Oland chip family
      drm/radeon: switch back to using the DMA ring for VM PT updates
      drm/radeon: use IBs for VM page table updates v2
      drm/radeon: don't reset the MC on IGPs/APUs
      drm/radeon: use the reset mask to determine if rings are hung
      drm/radeon: halt engines before disabling MC (si)
      drm/radeon: halt engines before disabling MC (cayman/TN)
      drm/radeon: halt engines before disabling MC (evergreen)
      drm/radeon: halt engines before disabling MC (6xx/7xx)
      drm/radeon: use status regs to determine what to reset (si)
      drm/radeon: use status regs to determine what to reset (cayman)
      drm/radeon: use status regs to determine what to reset (evergreen)
      drm/radeon: use status regs to determine what to reset (6xx/7xx)
      drm/radeon: rework GPU reset on cayman/TN
      drm/radeon: rework GPU reset on cayman/TN
      ...
    73ccd696
radeon_device.c 37.9 KB