• Dave Airlie's avatar
    Merge branch 'drm-next-3.11' of git://people.freedesktop.org/~agd5f/linux into drm-next · 5b0207bb
    Dave Airlie authored
    This is the pull request for radeon for 3.11.  Highlights include:
    
    - Support for CIK (Sea Islands) asics: 3D, compute, UVD
    - DPM (Dynamic Power Management) support for 6xx-SI
    - ASPM support for 6xx-SI
    - Assorted bug fixes
    
    * 'drm-next-3.11' of git://people.freedesktop.org/~agd5f/linux: (168 commits)
      drm/radeon/SI: fix TDP adjustment in set_power_state
      drm/radeon/NI: fix TDP adjustment in set_power_state
      drm/radeon: fix endian issues in atombios dpm code
      drm/radeon/dpm: fix UVD clock setting on SI
      drm/radeon/dpm: fix UVD clock setting on cayman
      drm/radeon/dpm: add support for setting UVD clock on rv6xx
      drm/radeon/dpm: add support for setting UVD clock on rs780
      drm/radeon: fix typo in ni_print_power_state
      drm/radeon: fix typo in cik_select_se_sh()
      drm/radeon/si: fix typo in function name
      drm/radeon/dpm: fix typo in setting uvd clock
      drm/radeon/dpm: add dpm_set_power_state failure output (si)
      add dpm_set_power_state failure output (7xx-ni)
      drm/radeon/dpm: add dpm_set_power_state failure output (7xx-ni)
      drm/radeon/dpm: add dpm_enable failure output (si)
      drm/radeon/dpm: add dpm_enable failure output (7xx-ni)
      drm/radeon/kms: add dpm support for SI (v7)
      drm/radeon: switch SI to use radeon_ucode.h
      drm/radeon: add SI to r600_is_internal_thermal_sensor()
      drm/radeon/dpm/rs780: properly catch errors in dpm setup
      ...
    5b0207bb
radeon_ring.c 25.8 KB