Merge branch 'drm-next-3.11' of git://people.freedesktop.org/~agd5f/linux into drm-next
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 ...
Showing
- drivers/gpu/drm/radeon/Makefile 4 additions, 1 deletiondrivers/gpu/drm/radeon/Makefile
- drivers/gpu/drm/radeon/ObjectID.h 40 additions, 0 deletionsdrivers/gpu/drm/radeon/ObjectID.h
- drivers/gpu/drm/radeon/atombios.h 511 additions, 36 deletionsdrivers/gpu/drm/radeon/atombios.h
- drivers/gpu/drm/radeon/atombios_crtc.c 79 additions, 9 deletionsdrivers/gpu/drm/radeon/atombios_crtc.c
- drivers/gpu/drm/radeon/atombios_encoders.c 46 additions, 5 deletionsdrivers/gpu/drm/radeon/atombios_encoders.c
- drivers/gpu/drm/radeon/btc_dpm.c 2740 additions, 0 deletionsdrivers/gpu/drm/radeon/btc_dpm.c
- drivers/gpu/drm/radeon/btc_dpm.h 57 additions, 0 deletionsdrivers/gpu/drm/radeon/btc_dpm.h
- drivers/gpu/drm/radeon/btcd.h 181 additions, 0 deletionsdrivers/gpu/drm/radeon/btcd.h
- drivers/gpu/drm/radeon/cik.c 6987 additions, 0 deletionsdrivers/gpu/drm/radeon/cik.c
- drivers/gpu/drm/radeon/cik_blit_shaders.c 246 additions, 0 deletionsdrivers/gpu/drm/radeon/cik_blit_shaders.c
- drivers/gpu/drm/radeon/cik_blit_shaders.h 32 additions, 0 deletionsdrivers/gpu/drm/radeon/cik_blit_shaders.h
- drivers/gpu/drm/radeon/cik_reg.h 147 additions, 0 deletionsdrivers/gpu/drm/radeon/cik_reg.h
- drivers/gpu/drm/radeon/cikd.h 1297 additions, 0 deletionsdrivers/gpu/drm/radeon/cikd.h
- drivers/gpu/drm/radeon/clearstate_cayman.h 1081 additions, 0 deletionsdrivers/gpu/drm/radeon/clearstate_cayman.h
- drivers/gpu/drm/radeon/clearstate_defs.h 44 additions, 0 deletionsdrivers/gpu/drm/radeon/clearstate_defs.h
- drivers/gpu/drm/radeon/clearstate_evergreen.h 1080 additions, 0 deletionsdrivers/gpu/drm/radeon/clearstate_evergreen.h
- drivers/gpu/drm/radeon/clearstate_si.h 941 additions, 0 deletionsdrivers/gpu/drm/radeon/clearstate_si.h
- drivers/gpu/drm/radeon/cypress_dpm.c 2176 additions, 0 deletionsdrivers/gpu/drm/radeon/cypress_dpm.c
- drivers/gpu/drm/radeon/cypress_dpm.h 160 additions, 0 deletionsdrivers/gpu/drm/radeon/cypress_dpm.h
- drivers/gpu/drm/radeon/evergreen.c 614 additions, 30 deletionsdrivers/gpu/drm/radeon/evergreen.c
Loading
Please register or sign in to comment