* [pull] radeon and amdgpu drm-next-4.9
@ 2016-08-24 21:46 Alex Deucher
0 siblings, 0 replies; 10+ messages in thread
From: Alex Deucher @ 2016-08-24 21:46 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
airlied-Re5JQEeQqe8AvxtiuMwx3w
Cc: Alex Deucher
Hi Dave,
First drm-next pull for radeon and amdgpu for 4.9. Highlights:
- powerplay support for iceland asics
- improved GPU reset (both full asic and per block)
- UVD and VCE powergating for CZ and ST
- VCE clockgating for CZ and ST
- Support for pre-initialized (e.g., zeroed) vram buffers
- ttm cleanups
- virtual display support
- core and radeon/amdgpu support for page_flip_target
- lots of bug fixes and clean ups
The following changes since commit 5c6c201ccbaf9d3901f829441d457293f7ca8ef4:
drm: Paper over locking inversion after registration rework (2016-08-08 16:08:25 +1000)
are available in the git repository at:
git://people.freedesktop.org/~agd5f/linux drm-next-4.9
for you to fetch changes up to 7b4d3e297e8a7d3b82e68231ff077e891c370349:
drm/amdgpu: use memcpy_toio for VCE firmware upload (2016-08-24 16:25:07 -0400)
----------------------------------------------------------------
Alex Deucher (14):
drm/amdgpu/powerplay: enable powerplay by default on TOPAZ
drm/amdgpu/gmc7: add missing mullins case
drm/amdgpu/ci: add mullins to default case for smc ucode
drm/amdgpu/gfx8: remove stale function declaration
drm/amdgpu: move all Kconfig options to amdgpu/Kconfig
drm/amdgpu: move vsync_timer_enabled setup to dce virtual early_init
drm/amdgpu/virtual_dce: add case for topaz for disable_dce
drm/amdgpu: add virtual dce support for iceland
drm/amdgpu: fix IB alignment for UVD
drm/amdgpu: fix VCE ib alignment value
drm/amdgpu: add support for UVD_NO_OP register
drm/radeon: add support for UVD_NO_OP register
drm/amdgpu: switch UVD code to use UVD_NO_OP for padding
drm/radeon: switch UVD code to use UVD_NO_OP for padding
Alexandre Demers (3):
Fixing copy-paste errors and removing unneeded newlines
drm/amdgpu: Use correct mask in dce_v8_0_afmt_setmode() and fix comment typos.
drm/amdgpu: Fix indentation in dce_v8_0_audio_write_sad_regs()
Christian König (25):
drm/amdgpu: add new helper for in kernel allocations
drm/amdgpu: pin shared GWS, GDS and OA resources
drm/amdgpu: add more warning to amdgpu_bo_offset
drm/amdgpu: user amdgpu_bo_create_kernel for the UVD BO
drm/amdgpu: use amdgpu_bo_create_kernel in amdgpu_ih.c
drm/amdgpu: use amdgpu_bo_create_kernel in amdgpu_ring.c
drm/amdgpu: remove unused VM defines
drm/amdgpu: cleanup VM fragment defines
drm/amdgpu: rename amdgpu_vm_update_params
drm/amdgpu: add adev to the pte_update_params
drm/amdgpu: flip frag_ptes and update_pts
drm/amdgpu: use more than 64KB fragment size if possible
drm/amdgpu: write PTEs directly into the IB.
drm/amdgpu: remove pages_addr handling from the VM code
drm/amdgpu: cleanup the write_pte implementations
drm/amdgpu: remove AMDGPU_VM_NO_FLUSH define
drm/amdgpu: stop splitting PTE commands into smaller ones
drm/amdgpu: add function pointer to the pte_update_params
drm/amdgpu: fix coding style in amdgpu_object.c
drm/amdgpu: fix lru size grouping v2
drm/amdgpu: cleanup amdgpu_ttm_placement_init
drm/amdgpu: stop adding dummy entry in amdgpu_ttm_placement_init
drm/amdgpu: cleanup amdgpu_vm_bo_update params
drm/amdgpu: use memcpy_to/fromio for UVD fw upload
drm/amdgpu: use memcpy_toio for VCE firmware upload
Chunming Zhou (26):
drm/amdgpu: add check_soft_reset ip func
drm/amdgpu: implement gfx8 check_soft_reset
drm/amdgpu: add pre_soft_reset ip func
drm/amdgpu: add gfx8 pre soft reset
drm/amdgpu: add amdgpu soft reset
drm/amdgpu: implement gfx8 post_soft_reset
drm/amdgpu: implement sdma3 check/pre/post_soft_reset
drm/amdgpu: implement gmc8 check/pre/post_soft_reset
drm/amdgpu: implement vi ih check/pre/post_soft_reset
drm/amdgpu: implement UVD6 check/pre/post_soft_reset
drm/amdgpu: implement vce3 check/post_soft_reset
drm/amdgpu: add dce10 check_soft_reset
drm/amdgpu: irq resume should be immediately after gpu resume
drm/amdgpu: fix harvest config checking in vce3 check_soft_reset
drm/amdgpu: enable VCE soft reset
drm/amdgpu: add shadow bo support V2
drm/amdgpu: validate shadow as well when validating bo
drm/amdgpu: allocate shadow for pd/pt bo V2
drm/amdgpu: add shadow flag V2
drm/amdgpu: add need backup function V2
drm/amdgpu: add direct submision option for copy_buffer
drm/amdgpu: sync bo and shadow V3
drm/amdgpu: update pd shadow while updating pd V2
drm/amdgpu: update pt shadow while updating pt V2
drm/amdgpu: link all shadow bo V2
drm/amdgpu: recover vram bo from shadow after gpu reset V2
Emily Deng (16):
drm/amdgpu: Add virtual connector and encoder macros.
drm/amdgpu: Initialize dce_virtual_ip_funcs
drm/amdgpu: Initialize dce_virtual_display_funcs.
drm/amdgpu: Initialize crtc, pageflip irq funcs (v2)
drm/amdgpu: Initialize dce_virtual_crtc_helper_funcs
drm/amdgpu: Initialize dce_virtual_crtc_funcs. (v2)
drm/amdgpu: To define whether the GPU has DCE engine.
drm/amdgpu: Disable VGA render and crtc when init GMC.
drm/amdgpu: Use software timer to generate vsync interrupt.
drm/amdgpu: Call pageflip irq funtion when receiced vsync interrupt.
drm/amdgpu: Add DRM_MODE_CONNECTOR_VIRTUAL connector in amdgpu_connector_add.
drm/amdgpu: Define virtual display ip blocks.
drm/amdgpu: Define one variable for virtual display.
drm/amdgpu: Set ip_blocks according variable amdgpu_virtual_display.
drm/amdgpu: Change the virtual_display type from int to char*.
drm/amdgpu: Hardcode virtual DCE vblank / scanout position return values
Eric Huang (1):
drm/amd/amdgpu: change pptable output format from ASCII to binary
Flora Cui (6):
drm/amdgpu: implement amdgpu_fill_buffer()
drm/amdgpu: expose AMDGPU_GEM_CREATE_VRAM_CLEARED to user space
amdgpu: move ttm stuff to amdgpu_ttm.h
drm/amdgpu: check domain sanity in amdgpu_bo_pin_restricted()
drm/amdgpu: update gart_pin_size only if the bo is pined to GTT
drm/amdgpu: use domain's gpu_offset for start addr
Heinrich Schuchardt (6):
drm/amdgpu/gmc7: remove dead code (v2)
drm/amdgpu/gmc8: remove dead code (v2)
drm/amd/powerplay: avoid NULL pointer dereference
drm/amd/powerplay: avoid NULL dereference, cz_hwmgr.c
drm/radeon/cik: remove dead code (v2)
drm/radeon: remove dead code, si_mc_load_microcode (v2)
Huang Rui (11):
drm/amd/powerplay: add SMU71 header files for iceland (v2)
drm/amd/powerplay: add iceland SMU mananger
drm/amd/powerplay: add iceland_dyn_defaults header
drm/amd/powerplay: add iceland HW manager
drm/amdgpu: enable iceland powerplay manually
drm/amd/powerplay: fix the incorrect checking condition
drm/amd/powerplay: add deep sleep initialization
drm/amd/powerplay: set the platform capability flags for iceland
drm/amd/powerplay: add enabling voltage controller back
drm/amd/powerplay: add DPM running checking back
drm/amd/powerplay: enable powerplay as default on CZ/ST
Ken Wang (2):
drm/ttm: Add interface to export kernel_zone max memory size in ttm
drm/amdgpu: use the kernel zone memory size as the max remote memory in amdgpu
Leo Liu (1):
drm/amdgpu: remove the check for sessions being closed
Lyude (4):
drm/radeon: Don't print error on aux transaction timeouts
drm/radeon: Don't retry 7 times in radeon_dp_dpcd()
drm/amdgpu: Don't print error on aux transaction timeouts
drm/amdgpu: Don't retry 7 times in amdgpu_atombios_dp_get_dpcd()
Marek Olšák (2):
drm/amdgpu: print more accurate error messages on IB submission failure
drm/amdgpu: add AMDGPU_INFO_NUM_EVICTIONS
Michel Dänzer (9):
drm/ttm: Wait for a BO to become idle before unbinding it from GTT
drm/ttm: Remove unused parameter evict from ttm_bo_move_ttm
drm/ttm: Remove unused parameter evict from ttm_bo_move_memcpy
drm: Add page_flip_target CRTC hook v2
drm/amdgpu: Provide page_flip_target hook
drm/amdgpu: Set MASTER_UPDATE_MODE to 0 again
drm/radeon: Provide page_flip_target hook
drm/radeon: Set MASTER_UPDATE_MODE to 0 again
drm: Add DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags v2
Rex Zhu (13):
drm/amd/powerplay: fix typos of volt/millivolt symbols in comment.
drm/amdgpu: add module parameters to ctrl powerplay feature
drm/amdgpu: use modules parameter to ctrl deep sleep feature in dpm
drm/amd/powerplay: delete useless code in hwmgr.
drm/amd/powerplay: pass sub_device_id and sub_vendor_id to powerplay.
drm/amdgpu: AMD SW workaround for certain partner boards
drm/amd/powrplay: workaround Memory EDC Error for certain partner boards.
drm/amd/powrplay: delete code no longer in use on Polaris.
drm/amdgpu: remove RB1_BUSY bit checking
drm/amd/powerplay: delete code set/unset deep_sleep/power_containment.
drm/amd/powerplay: change structure variable name.
drm/amd/powerplay: enable power containment features for tonga.
drm/amd/powerplay: delete useless code in iceland_hwmgr.c.
Tom St Denis (29):
drm/amd/amdgpu: add mutex locking for both DPM and PP based powergating for UVD/VCE
drm/amd/amdgpu: add pm lock to debugfs mmio entry
drm/amd/amdgpu: don't set clockgating in uvd_v6_0_start()
drm/amd/amdgpu: don't track state in UVD clockgating
drm/amd/amdgpu: enable PG_EN bit in powergating UVD
drm/amd/amdgpu: Add error messages to UVD PG in DPM
drm/amd/amdgpu: Enable carrizo GFX PG
drm/amd/amdgpu: Enable carrizo UVD PG
drm/amd/amdgpu: Enable carrizo VCE PG
drm/amd/amdgpu: Enable stoney GFX PG
drm/amd/amdgpu: Enable stoney UVD PG
drm/amd/amdgpu: Enable stoney VCE PG
drm/amd/amdgpu: fix indentation in vce3 CG
drm/amd/amdgpu: Fix VCE CG order and resume defaults
drm/amd/amdgpu: Don't set VCE CG in startup
drm/amd/amdgpu: Enable VCE MGCG for Carrizo
drm/amd/amdgpu: Enable VCE MGCG for Stoney
drm/amd/amdgpu: Partially revert change to UVD v3 CG
drm/amd/amdgpu: Correct whitespace in GFX v8
drm/amd/amdgpu: Simplify various gfx v8 functions
drm/amd/amdgpu: Simplify bitfield operations in gfx v8
drm/amd/amdgpu: Cleanup register access in VCE v3
drm/amd/amdgpu: add mutex in check_soft for VCE v3
drm/amd/amdgpu: VCE v2 register cleanup
drm/amd/amdgpu: UVD v6 register cleanup
drm/amd/amdgpu: Add more config data for debugfs
drm/amd/amdgpu: Add more debugfs config data
drm/amd/powerplay: Tidy up cz_hwmgr.c
drm/amd/amdgpu: Print ring name in amdgpu_ib_schedule()
Wolfram Sang (2):
gpu: drm: amd: amdgpu: amdgpu_i2c: don't print error when adding adapter fails
gpu: drm: radeon: radeon_i2c: don't print error when adding adapter fails
jimqu (1):
drm/amd/amdgpu: S3 resumed failed after 4-5 times loop
drivers/gpu/drm/Kconfig | 3 -
drivers/gpu/drm/amd/amdgpu/Kconfig | 2 +
drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
drivers/gpu/drm/amd/amdgpu/ObjectID.h | 7 +
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 94 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 27 +
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 91 +
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 95 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 266 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 101 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 8 -
drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 27 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 12 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 423 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 32 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 65 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 10 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 27 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 112 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 80 +
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 58 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 454 +-
drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 22 +-
drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 +-
drivers/gpu/drm/amd/amdgpu/cik.c | 417 +-
drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 113 +-
drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 47 +-
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 68 +-
drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 2 +
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 59 +-
drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 2 +
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 85 +-
drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 2 +
drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 806 +++
drivers/gpu/drm/amd/amdgpu/dce_virtual.h | 31 +
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 21 +-
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 628 +--
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 2 -
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 18 +-
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 76 +-
drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 6 +-
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 113 +-
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 195 +-
drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 49 +-
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +-
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 121 +-
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 160 +-
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 293 +-
drivers/gpu/drm/amd/amdgpu/vi.c | 438 +-
drivers/gpu/drm/amd/include/amd_shared.h | 6 +
.../gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_d.h | 1 +
.../gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_d.h | 1 +
.../gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h | 1 +
drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 5 +-
drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 6 +-
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 58 +-
drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 3 -
.../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c | 7 +-
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 64 +-
.../amd/powerplay/hwmgr/iceland_clockpowergating.c | 119 +
.../amd/powerplay/hwmgr/iceland_clockpowergating.h | 38 +
.../drm/amd/powerplay/hwmgr/iceland_dyn_defaults.h | 41 +
.../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c | 5692 ++++++++++++++++++++
.../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.h | 424 ++
.../drm/amd/powerplay/hwmgr/iceland_powertune.c | 490 ++
.../drm/amd/powerplay/hwmgr/iceland_powertune.h | 74 +
.../gpu/drm/amd/powerplay/hwmgr/iceland_thermal.c | 595 ++
.../gpu/drm/amd/powerplay/hwmgr/iceland_thermal.h | 58 +
.../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 32 +-
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 24 +-
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 11 +-
.../gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c | 498 ++
.../gpu/drm/amd/powerplay/hwmgr/tonga_powertune.h | 22 +-
drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 4 +-
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 112 +-
drivers/gpu/drm/amd/powerplay/inc/smu71.h | 510 ++
drivers/gpu/drm/amd/powerplay/inc/smu71_discrete.h | 631 +++
drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 3 +-
.../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 713 +++
.../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 64 +
.../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 4 +-
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 4 +
drivers/gpu/drm/drm_crtc.c | 66 +-
drivers/gpu/drm/drm_ioctl.c | 8 +
drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +-
drivers/gpu/drm/qxl/qxl_ttm.c | 4 +-
drivers/gpu/drm/radeon/atombios_crtc.c | 8 +-
drivers/gpu/drm/radeon/atombios_dp.c | 21 +-
drivers/gpu/drm/radeon/cik.c | 12 +-
drivers/gpu/drm/radeon/cikd.h | 1 +
drivers/gpu/drm/radeon/evergreen.c | 5 +-
drivers/gpu/drm/radeon/evergreend.h | 1 +
drivers/gpu/drm/radeon/ni.c | 2 +-
drivers/gpu/drm/radeon/nid.h | 1 +
drivers/gpu/drm/radeon/r600.c | 2 +-
drivers/gpu/drm/radeon/r600d.h | 1 +
drivers/gpu/drm/radeon/radeon.h | 1 +
drivers/gpu/drm/radeon/radeon_display.c | 89 +-
drivers/gpu/drm/radeon/radeon_dp_auxch.c | 1 -
drivers/gpu/drm/radeon/radeon_drv.c | 3 +-
drivers/gpu/drm/radeon/radeon_i2c.c | 8 +-
drivers/gpu/drm/radeon/radeon_ttm.c | 7 +-
drivers/gpu/drm/radeon/radeon_uvd.c | 7 +-
drivers/gpu/drm/radeon/rv515.c | 3 +-
drivers/gpu/drm/radeon/rv770.c | 2 +-
drivers/gpu/drm/radeon/rv770d.h | 1 +
drivers/gpu/drm/radeon/si.c | 12 +-
drivers/gpu/drm/radeon/sid.h | 1 +
drivers/gpu/drm/ttm/ttm_bo.c | 5 +-
drivers/gpu/drm/ttm/ttm_bo_util.c | 15 +-
drivers/gpu/drm/ttm/ttm_memory.c | 6 +
include/drm/drm_crtc.h | 18 +
include/drm/ttm/ttm_bo_driver.h | 8 +-
include/drm/ttm/ttm_memory.h | 1 +
include/uapi/drm/amdgpu_drm.h | 6 +
include/uapi/drm/drm.h | 1 +
include/uapi/drm/drm_mode.h | 39 +-
127 files changed, 14481 insertions(+), 2026 deletions(-)
create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.h
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_clockpowergating.c
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_clockpowergating.h
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_dyn_defaults.h
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.h
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_powertune.c
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_powertune.h
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_thermal.c
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_thermal.h
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c
create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu71.h
create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu71_discrete.h
create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [pull] radeon and amdgpu drm-next-4.9
@ 2016-09-16 20:42 Alex Deucher
2016-09-16 21:38 ` Lukas Wunner
0 siblings, 1 reply; 10+ messages in thread
From: Alex Deucher @ 2016-09-16 20:42 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
airlied-Re5JQEeQqe8AvxtiuMwx3w
Cc: Alex Deucher
Hi Dave,
More radeon and amdgpu changes for 4.9. Highlights:
- Initial SI support for amdgpu (controlled by a Kconfig option)
- misc ttm cleanups
- runtimepm fixes
- S3/S4 fixes
- power improvements
- lots of code cleanups and optimizations
The following changes since commit 7b4d3e297e8a7d3b82e68231ff077e891c370349:
drm/amdgpu: use memcpy_toio for VCE firmware upload (2016-08-24 16:25:07 -0400)
are available in the git repository at:
git://people.freedesktop.org/~agd5f/linux drm-next-4.9
for you to fetch changes up to af1f85ddecfa341e684db950c34a1813d36750db:
drm/ttm: remove cpu_address member from ttm_tt (2016-09-16 15:53:05 -0400)
----------------------------------------------------------------
Alex Deucher (39):
drm/amdgpu: rename suspend_kms and resume_kms
drm/amdgpu: track the number of vce rings
drm/amdgpu/vce3: add support for third vce ring
drm/amdgpu/si: Add updated smc firmware for SI kickers
drm/amdgpu/gfx6: drop some dead code
drm/amdgpu: set runtime pm state to active on resume
drm/amdgpu: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
drm/radeon: set runtime pm state to active on resume
drm/radeon: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
drm/amdgpu: handle runtime pm correctly in amdgpu_driver_open_kms
drm/radeon: handle runtime pm correctly in amdgpu_driver_open_kms
drm/amdgpu: handle runtime pm in drm pre/post close
drm/radeon: handle runtime pm in drm pre/post close
drm/amdgpu: wire up a pci shutdown callback
drm/radeon: wire up a pci shutdown callback
drm/amdgpu/si/dpm: make a bunch of things static
drm/amdgpu/si/dpm: fix symbol conflicts with radeon
drm/amdgpu: handle runtime pm in fbcon (v2)
drm/radeon: handle runtime pm in fbcon (v2)
drm/amdgpu/si: fix ring size for compute
drm/amdgpu/gfx6: drop duplicate code
drm/amdgpu/gfx6: add ring_emit_cntxcntl
drm/amdgpu/gfx6: drop gds_switch callback
drm/amdgpu/sdma3: drop unused functions
drm/amdgpu/ring: add an interface to get dma frame and ib size
drm/amdgpu/gfx6: add ring callbacks for ib and dma frame size
drm/amdgpu/gfx7: add ring callbacks for ib and dma frame size
drm/amdgpu/gfx8: add ring callbacks for ib and dma frame size
drm/amdgpu/si_dma: add ring callbacks for ib and dma frame size
drm/amdgpu/cik_sdma: add ring callbacks for ib and dma frame size
drm/amdgpu/sdma2.4: add ring callbacks for ib and dma frame size
drm/amdgpu/sdma3: add ring callbacks for ib and dma frame size
drm/amdgpu/uvd4.2: add ring callbacks for ib and dma frame size
drm/amdgpu/uvd5: add ring callbacks for ib and dma frame size
drm/amdgpu/uvd6: add ring callbacks for ib and dma frame size
drm/amdgpu/vce: add common ring callbacks for ib and dma frame size
drm/amdgpu/vce2: add ring callbacks for ib and dma frame size
drm/amdgpu/vce3: add ring callbacks for ib and dma frame size
drm/amdgpu: use the new ring ib and dma frame size callbacks (v2)
Alexandre Courbot (1):
drm/ttm: remove cpu_address member from ttm_tt
Baoyou Xie (6):
drm/amdgpu: add missing header dependencies
drm/amdgpu: mark symbols static where possible
drm/amd/powerplay/fiji: mark symbols static where possible
drm/amd/powerplay/polaris10: mark symbols static where possible
drm/amdgpu: clean function declarations in amdgpu_ttm.c up
drm/radeon/radeon_device: remove unused function
Christian König (13):
drm/amdgpu: only try again if we actually run into -ENOMEM
drm/amdgpu: prevent command submission failures under memory pressure v2
drm/amdgpu: fix GTT offset handling
drm/amdgpu: bind GTT on demand
drm/ttm: use ffs in ttm_mem_type_from_place
drm/ttm: rework handling of private mem types
drm/ttm: remove unused placement flags
drm/ttm: move placement structures into ttm_placement.h
drm/amdgpu: validate size and offset of user fence BO
drm/amdgpu: add AMDGPU_BO_INVALID_OFFSET
drm/amdgpu: unbind GTT only when it is bound
drm/amdgpu: use explicit GTT limit for evictions
drm/amdgpu: use explicit limit for VRAM<->GTT moves
Chunming Zhou (2):
drm/amdgpu: link all gtt when binding them V2
drm/amdgpu: add gart recovery by gtt list V2
Edward O'Callaghan (1):
amd/powerplay: use kmemdup instead of kmalloc + memcpy
Flora Cui (1):
drm/amdgpu: update gart_pin_size if bo is in GTT
Huang Rui (5):
drm/amdgpu: introduce pcie port read/write entry
drm/amdgpu: use DRM print instead of printk
drm/amdgpu: move some release handles into fail labels (v2)
drm: modify drm_global_item_ref to avoid two times of writing ref->object
drm/amdgpu: use error label to handle exceptional case
Jordan Lazare (2):
drm/amd/powerplay: Remove unused variable causing compile warning
drm/amdgpu/vi: Use correct external_rev_id for stoney
Junwei Zhang (2):
drm/amdgpu: add a new helper to free a BO in kernel allocations
drm/amdgpu: free the BO in kernel by helper amdgpu_bo_free_kernel()
Ken Wang (14):
drm/amdgpu: add SI asics types v2
drm/amdgpu: add si header files v4
drm/amdgpu: add graphic memory controller implementation for si v7
drm/amdgpu: add interupt handler implementation for si v3
drm/amdgpu: add display controller implementation for si v10
drm/amdgpu: atombios change for dce6 to work v3
drm/amdgpu: add graphic pipeline implementation for si v8
drm/amdgpu: add DMA implementation for si v8
drm/amdgpu: add si implementation v10
drm/amdgpu: add all the components for si into Makefile/kconfig v3
drm/amdgpu: add si ip blocks setup v3
drm/amdgpu: add si specific logic into the device initialize function v3
drm/amdgpu: Add SI Family information
drm/amdgpu: add si pciids v2
Marek Olšák (1):
drm/amdgpu: throttle buffer migrations at CS using a fixed MBps limit (v2)
Maruthi Bayyavarapu (1):
drm/amdgpu: add SI DPM support (v4)
Maruthi Srinivas Bayyavarapu (4):
drm/amdgpu: add si dpm support in amdgpu_atombios
drm/amdgpu: add SI SMC support
drm/amdgpu: enable SI DPM
drm/amdgpu: add VCE VM mode support
Michel Dänzer (1):
drm/amdgpu/si: Call amdgpu_ttm_set_active_vram_size from si_dma_start/stop
Monk Liu (4):
drm/amdgpu:add switch buffer to end of CS (v2)
drm/amdgpu: new method to sync ce&de
drm/amdgpu: change job->ctx field name
drm/amdgpu:implement CONTEXT_CONTROL (v5)
Rex Zhu (28):
drm/amdgpu: refine function name for consistency
drm/amd/powerplay: add bypass mode for vce 2.0.
drm/amdgpu: add vce bypass mode for tonga.
drm/amdgpu: add support for getting sub_device id and sub_vendor_id in cgs interface.
drm/amd/powerplay: get system info by cgs interface.
drm/amd/powerplay: simplify struct amd_pp_init.
drm/amdgpu: refine uvd gate logic for CI.
drm/amd/powerplay: refine struct name for code style reason.
drm/amd/powerplay: add vce state tables initialize for ppt v1.
drm/amd/powerplay: refine struct name for coding style reason.
drm/amd/powerplay: original power state table should not be changed.
drm/amd/powerplay: enable/disable auto thermal throttle for tonga.
drm/amd/powerplay: fix issue power containment not enabled on Tonga.
drm/amd/powerplay: calculate flexible array member's address.
drm/amd/powerplay: declare functions instand of include header file.
drm/amd/powerplay: mark symbols static where possible on tonga/iceland.
drm/amd/powerplay: add feature flags in hwmgr to enable/disable special features.
drm/amd/powerplay: add module parameter to mask pp features
drm/amd/powerplay: initialize platform caps in hwmgr_init.
drm/amd/powerplay: add helper function to get voltage id in votage table
drm/amd/powerplay: wrap get evv voltage functions
drm/amd/powerplay: move smu related variable definitions to smumgr.
drm/amd/powerplay: delete duplicated function and definition.
drm/amd/powerplay: rename tonga_processpptable* to processpptable_v1_0*.
drm/amd/powerplay: add pp_table_version in hwmgr.
drm/amd/powerplay: add pptable point check before use it
drm/amdgpu: not set cg for vce/uvd in late init.
drm/amd/powerplay: Partially revert change initialize platform caps
Tom St Denis (25):
drm/amd/amdgpu: Fix memleak in cz_parse_power_table()
drm/amd/amdgpu: Clean up memory leak in cz_dpm_init().
drm/amd/amdgpu: Tidy up cz_dpm.c
drm/amd/powerplay: Fix CZ SMU firmware load check (v4)
drm/amd/powerplay: Tidy up cz SMU manager
drm/amd/powerplay: Fix up return codes in cz SMU manager
drm/amd/powerplay: Only load SDMA0/MEC firmware once on Stoney (v2)
drm/amd/amdgpu: debugfs SMC addresses are byte addresses
drm/amd/amdgpu: Add GRBM lock to various SI functions
drm/amd/amdgpu: Simplify mask creation in gfx6
drm/amd/amdgpu: Various tidy ups for gfx6
drm/amd/amdgpu: Merge get_rptr functions in gfx6
drm/amd/amdgpu: Merge get_rptr functions in gfx7
drm/amd/amdgpu: Merge get_rptr functions in gfx8
drm/amd/amdgpu: Merge get_wptr functions in gfx6
drm/amd/amdgpu: Tidy up SI DMA code
drm/amd/amdgpu: Allow calling si_dpm_fini at any point
drm/amd/amdgpu: Clean up SI DPM table assignments
drm/amd/amdgpu: Correct whitespace in SI DPM code
drm/amd/amdgpu: Tidy up SI IH code
drm/amd/amdgpu: Tidy up SI SMC code (v2)
drm/amd/amdgpu: Comment out currently unused SI DPM struct
drm/amd/amdgpu: Convert messages in gmc v6 to dev_*()
drm/amd/amdgpu: Remove double lock from gfx v6
drm/amd/amdgpu: Fix return values in SI DPM code
jimqu (1):
drm/amd/amdgpu: S4 issue for amdgpu (v2)
drivers/gpu/drm/amd/amdgpu/Kconfig | 7 +
drivers/gpu/drm/amd/amdgpu/Makefile | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 158 +
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 10 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 275 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 103 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 142 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 28 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 31 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 23 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 41 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +
drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 19 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 122 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 15 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 25 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 19 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 22 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 +-
drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 8 +-
drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 1 +
drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 +-
drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 18 +
drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 47 +-
drivers/gpu/drm/amd/amdgpu/cz_smc.c | 6 +-
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3160 ++++++++
drivers/gpu/drm/amd/amdgpu/dce_v6_0.h | 29 +
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3233 ++++++++
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h | 29 +
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 76 +-
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 120 +-
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1071 +++
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h | 29 +
drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 8 +-
drivers/gpu/drm/amd/amdgpu/r600_dpm.h | 127 +
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 18 +
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 43 +-
drivers/gpu/drm/amd/amdgpu/si.c | 1965 +++++
drivers/gpu/drm/amd/amdgpu/si.h | 33 +
drivers/gpu/drm/amd/amdgpu/si_dma.c | 915 +++
drivers/gpu/drm/amd/amdgpu/si_dma.h | 29 +
drivers/gpu/drm/amd/amdgpu/si_dpm.c | 7993 ++++++++++++++++++++
drivers/gpu/drm/amd/amdgpu/si_dpm.h | 1015 +++
drivers/gpu/drm/amd/amdgpu/si_ih.c | 299 +
drivers/gpu/drm/amd/amdgpu/si_ih.h | 29 +
drivers/gpu/drm/amd/amdgpu/si_smc.c | 273 +
drivers/gpu/drm/amd/amdgpu/sislands_smc.h | 422 ++
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 16 +
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 16 +
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 29 +
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 80 +-
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 148 +-
drivers/gpu/drm/amd/amdgpu/vi.c | 2 +-
drivers/gpu/drm/amd/amdgpu/vid.h | 4 +
drivers/gpu/drm/amd/include/amd_shared.h | 7 +-
.../drm/amd/include/asic_reg/si/clearstate_si.h | 941 +++
drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h | 105 +
drivers/gpu/drm/amd/include/asic_reg/si/sid.h | 2426 ++++++
drivers/gpu/drm/amd/include/atombios.h | 2 +
drivers/gpu/drm/amd/include/cgs_common.h | 2 +
drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 10 +-
drivers/gpu/drm/amd/powerplay/eventmgr/psm.c | 5 +-
drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 2 +-
drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 43 +-
drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c | 6 +-
.../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 34 -
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 166 +-
.../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c | 14 +-
.../powerplay/hwmgr/polaris10_clockpowergating.c | 10 +-
.../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 102 +-
.../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h | 5 +-
.../drm/amd/powerplay/hwmgr/polaris10_powertune.h | 13 -
.../drm/amd/powerplay/hwmgr/polaris10_thermal.c | 6 +-
.../hwmgr/{tonga_pptable.h => pptable_v1_0.h} | 2 +-
...a_processpptables.c => process_pptables_v1_0.c} | 280 +-
...a_processpptables.h => process_pptables_v1_0.h} | 10 +-
.../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 2 +-
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 111 +-
.../gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c | 3 -
drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 3 -
.../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 -
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 61 +-
drivers/gpu/drm/amd/powerplay/inc/power_state.h | 22 +-
drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 3 +
drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 7 +-
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 46 +-
.../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 -
.../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 20 +
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 7 +-
drivers/gpu/drm/drm_global.c | 24 +-
drivers/gpu/drm/qxl/qxl_object.c | 8 +-
drivers/gpu/drm/qxl/qxl_ttm.c | 12 +-
drivers/gpu/drm/radeon/radeon_device.c | 19 +-
drivers/gpu/drm/radeon/radeon_drv.c | 30 +-
drivers/gpu/drm/radeon/radeon_fb.c | 28 +
drivers/gpu/drm/radeon/radeon_kms.c | 17 +-
drivers/gpu/drm/ttm/ttm_bo.c | 14 +-
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 2 -
drivers/gpu/drm/ttm/ttm_tt.c | 7 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 8 +-
include/drm/ttm/ttm_bo_api.h | 32 +-
include/drm/ttm/ttm_bo_driver.h | 2 -
include/drm/ttm/ttm_placement.h | 56 +-
include/uapi/drm/amdgpu_drm.h | 1 +
111 files changed, 26351 insertions(+), 842 deletions(-)
create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_v6_0.h
create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h
create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h
create mode 100644 drivers/gpu/drm/amd/amdgpu/r600_dpm.h
create mode 100644 drivers/gpu/drm/amd/amdgpu/si.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/si.h
create mode 100644 drivers/gpu/drm/amd/amdgpu/si_dma.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/si_dma.h
create mode 100644 drivers/gpu/drm/amd/amdgpu/si_dpm.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/si_dpm.h
create mode 100644 drivers/gpu/drm/amd/amdgpu/si_ih.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/si_ih.h
create mode 100644 drivers/gpu/drm/amd/amdgpu/si_smc.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/sislands_smc.h
create mode 100644 drivers/gpu/drm/amd/include/asic_reg/si/clearstate_si.h
create mode 100644 drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h
create mode 100644 drivers/gpu/drm/amd/include/asic_reg/si/sid.h
rename drivers/gpu/drm/amd/powerplay/hwmgr/{tonga_pptable.h => pptable_v1_0.h} (99%)
rename drivers/gpu/drm/amd/powerplay/hwmgr/{tonga_processpptables.c => process_pptables_v1_0.c} (81%)
rename drivers/gpu/drm/amd/powerplay/hwmgr/{tonga_processpptables.h => process_pptables_v1_0.h} (81%)
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [pull] radeon and amdgpu drm-next-4.9
2016-09-16 20:42 [pull] radeon and amdgpu drm-next-4.9 Alex Deucher
@ 2016-09-16 21:38 ` Lukas Wunner
2016-09-16 22:07 ` Alex Deucher
0 siblings, 1 reply; 10+ messages in thread
From: Lukas Wunner @ 2016-09-16 21:38 UTC (permalink / raw)
To: Alex Deucher; +Cc: Alex Deucher, dri-devel, amd-gfx
On Fri, Sep 16, 2016 at 04:42:43PM -0400, Alex Deucher wrote:
> drm/amdgpu: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
> drm/radeon: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
Those two are unnecessary, it can't happen that the ->suspend hook
is executed with the device runtime suspended.
Since commit d14d2a8453d6 ("drm: Remove dev_pm_ops from drm_class"),
DRM devices are afforded direct_complete, i.e. if the GPU is runtime
suspended upon system sleep, it is left in this state. The only
callbacks that are executed are the ->prepare and the ->complete hook.
All the callbacks in-between, like ->suspend, are skipped.
Even if direct_complete is not afforded for some reason, the PM core
will automatically runtime resume the device before executing ->suspend.
That ->suspend is skipped in the DRM_SWITCH_POWER_OFF case was done
because the device is suspended behind the PM core's back if runpm=0
is set. (And it doesn't work properly because the PCI core will
invalidate the saved_state during ->resume_noirq. That could be
solved by returning 1 from the ->prepare hook in the DRM_SWITCH_POWER_OFF
case, but that's a different story.)
(Sorry for not raising this earlier, I'm not subscribed to amd-gfx.)
Best regards,
Lukas
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [pull] radeon and amdgpu drm-next-4.9
2016-09-16 21:38 ` Lukas Wunner
@ 2016-09-16 22:07 ` Alex Deucher
2016-09-17 10:23 ` Lukas Wunner
0 siblings, 1 reply; 10+ messages in thread
From: Alex Deucher @ 2016-09-16 22:07 UTC (permalink / raw)
To: Lukas Wunner; +Cc: Alex Deucher, Maling list - DRI developers, amd-gfx list
On Fri, Sep 16, 2016 at 5:38 PM, Lukas Wunner <lukas@wunner.de> wrote:
> On Fri, Sep 16, 2016 at 04:42:43PM -0400, Alex Deucher wrote:
>> drm/amdgpu: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
>> drm/radeon: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
>
> Those two are unnecessary, it can't happen that the ->suspend hook
> is executed with the device runtime suspended.
>
> Since commit d14d2a8453d6 ("drm: Remove dev_pm_ops from drm_class"),
> DRM devices are afforded direct_complete, i.e. if the GPU is runtime
> suspended upon system sleep, it is left in this state. The only
> callbacks that are executed are the ->prepare and the ->complete hook.
> All the callbacks in-between, like ->suspend, are skipped.
>
> Even if direct_complete is not afforded for some reason, the PM core
> will automatically runtime resume the device before executing ->suspend.
>
> That ->suspend is skipped in the DRM_SWITCH_POWER_OFF case was done
> because the device is suspended behind the PM core's back if runpm=0
> is set. (And it doesn't work properly because the PCI core will
> invalidate the saved_state during ->resume_noirq. That could be
> solved by returning 1 from the ->prepare hook in the DRM_SWITCH_POWER_OFF
> case, but that's a different story.)
>
> (Sorry for not raising this earlier, I'm not subscribed to amd-gfx.)
Thanks for the heads up. They shouldn't hurt anything and it matches
what other drivers do. If you feel strongly about it, I can revert
them later.
Alex
>
> Best regards,
>
> Lukas
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [pull] radeon and amdgpu drm-next-4.9
2016-09-16 22:07 ` Alex Deucher
@ 2016-09-17 10:23 ` Lukas Wunner
[not found] ` <20160917102333.GA1422-JFq808J9C/izQB+pC5nmwQ@public.gmane.org>
0 siblings, 1 reply; 10+ messages in thread
From: Lukas Wunner @ 2016-09-17 10:23 UTC (permalink / raw)
To: Alex Deucher; +Cc: Alex Deucher, Maling list - DRI developers, amd-gfx list
On Fri, Sep 16, 2016 at 06:07:36PM -0400, Alex Deucher wrote:
> On Fri, Sep 16, 2016 at 5:38 PM, Lukas Wunner <lukas@wunner.de> wrote:
> > On Fri, Sep 16, 2016 at 04:42:43PM -0400, Alex Deucher wrote:
> >> drm/amdgpu: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
> >> drm/radeon: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
> >
> > Those two are unnecessary, it can't happen that the ->suspend hook
> > is executed with the device runtime suspended.
> >
> > Since commit d14d2a8453d6 ("drm: Remove dev_pm_ops from drm_class"),
> > DRM devices are afforded direct_complete, i.e. if the GPU is runtime
> > suspended upon system sleep, it is left in this state. The only
> > callbacks that are executed are the ->prepare and the ->complete hook.
> > All the callbacks in-between, like ->suspend, are skipped.
> >
> > Even if direct_complete is not afforded for some reason, the PM core
> > will automatically runtime resume the device before executing ->suspend.
> >
> > That ->suspend is skipped in the DRM_SWITCH_POWER_OFF case was done
> > because the device is suspended behind the PM core's back if runpm=0
> > is set. (And it doesn't work properly because the PCI core will
> > invalidate the saved_state during ->resume_noirq. That could be
> > solved by returning 1 from the ->prepare hook in the DRM_SWITCH_POWER_OFF
> > case, but that's a different story.)
> >
> > (Sorry for not raising this earlier, I'm not subscribed to amd-gfx.)
>
> Thanks for the heads up. They shouldn't hurt anything and it matches
> what other drivers do. If you feel strongly about it, I can revert
> them later.
Well, superfluous code shouldn't be included just because it doesn't hurt
or because others didn't know better either, or removed because of
someone else's feelings. ;-)
You can find the runtime resume before execution of the driver ->suspend
callback in drivers/pci/pci-driver.c:pci_pm_suspend():
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
...
pm_runtime_resume(dev);
...
if (pm->suspend) {
...
error = pm->suspend(dev);
The device is prevented from auto-suspending because of a runtime PM ref
acquired beforehand in drivers/base/power/main.c:device_prepare().
Best regards,
Lukas
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [pull] radeon and amdgpu drm-next-4.9
[not found] ` <20160917102333.GA1422-JFq808J9C/izQB+pC5nmwQ@public.gmane.org>
@ 2016-09-19 16:19 ` Alex Deucher
0 siblings, 0 replies; 10+ messages in thread
From: Alex Deucher @ 2016-09-19 16:19 UTC (permalink / raw)
To: Lukas Wunner
Cc: Alex Deucher, Dave Airlie, Maling list - DRI developers,
amd-gfx list
On Sat, Sep 17, 2016 at 6:23 AM, Lukas Wunner <lukas@wunner.de> wrote:
> On Fri, Sep 16, 2016 at 06:07:36PM -0400, Alex Deucher wrote:
>> On Fri, Sep 16, 2016 at 5:38 PM, Lukas Wunner <lukas@wunner.de> wrote:
>> > On Fri, Sep 16, 2016 at 04:42:43PM -0400, Alex Deucher wrote:
>> >> drm/amdgpu: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
>> >> drm/radeon: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
>> >
>> > Those two are unnecessary, it can't happen that the ->suspend hook
>> > is executed with the device runtime suspended.
>> >
>> > Since commit d14d2a8453d6 ("drm: Remove dev_pm_ops from drm_class"),
>> > DRM devices are afforded direct_complete, i.e. if the GPU is runtime
>> > suspended upon system sleep, it is left in this state. The only
>> > callbacks that are executed are the ->prepare and the ->complete hook.
>> > All the callbacks in-between, like ->suspend, are skipped.
>> >
>> > Even if direct_complete is not afforded for some reason, the PM core
>> > will automatically runtime resume the device before executing ->suspend.
>> >
>> > That ->suspend is skipped in the DRM_SWITCH_POWER_OFF case was done
>> > because the device is suspended behind the PM core's back if runpm=0
>> > is set. (And it doesn't work properly because the PCI core will
>> > invalidate the saved_state during ->resume_noirq. That could be
>> > solved by returning 1 from the ->prepare hook in the DRM_SWITCH_POWER_OFF
>> > case, but that's a different story.)
>> >
>> > (Sorry for not raising this earlier, I'm not subscribed to amd-gfx.)
>>
>> Thanks for the heads up. They shouldn't hurt anything and it matches
>> what other drivers do. If you feel strongly about it, I can revert
>> them later.
>
> Well, superfluous code shouldn't be included just because it doesn't hurt
> or because others didn't know better either, or removed because of
> someone else's feelings. ;-)
I've reverted the patches. They'll be in my next pull request.
Alex
>
> You can find the runtime resume before execution of the driver ->suspend
> callback in drivers/pci/pci-driver.c:pci_pm_suspend():
>
> const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
> ...
> pm_runtime_resume(dev);
> ...
> if (pm->suspend) {
> ...
> error = pm->suspend(dev);
>
> The device is prevented from auto-suspending because of a runtime PM ref
> acquired beforehand in drivers/base/power/main.c:device_prepare().
>
> Best regards,
>
> Lukas
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [pull] radeon and amdgpu drm-next-4.9
@ 2016-09-22 19:21 Alex Deucher
0 siblings, 0 replies; 10+ messages in thread
From: Alex Deucher @ 2016-09-22 19:21 UTC (permalink / raw)
To: amd-gfx, dri-devel, airlied; +Cc: Alex Deucher
Hi Dave,
Last set of radeon and amdgpu changes for 4.9. This is
mostly just the powerplay cleanup for dGPUs. Beyond that,
just misc code cleanups and bug fixes.
The following changes since commit af1f85ddecfa341e684db950c34a1813d36750db:
drm/ttm: remove cpu_address member from ttm_tt (2016-09-16 15:53:05 -0400)
are available in the git repository at:
git://people.freedesktop.org/~agd5f/linux drm-next-4.9
for you to fetch changes up to beb86f29c9c7f2d04f9a42c4c61cc469c3689779:
drm/amd/amdgpu: Clean up afmt allocation in DCEv6. (v2) (2016-09-22 14:15:59 -0400)
----------------------------------------------------------------
Alex Deucher (10):
drm/amdgpu/dce6: fix off by one in interrupt setup
Revert "drm/amdgpu: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF"
Revert "drm/radeon: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF"
drm/radeon: narrow asic_init for virtualization
drm/amdgpu/vce: allow the clock table packet
drm/amdgpu: bump version for new vce packet support
drm/amdgpu/atpx: check for ATIF dGPU wake for display events support
drm/amdgpu/atif: Send a hotplug event when we get dgpu display request
drm/radeon/atpx: check for ATIF dGPU wake for display events support
drm/radeon/atif: Send a hotplug event when we get dgpu display request
Baoyou Xie (2):
drm/amdgpu: remove unused functions
drm/amdgpu: mark symbols static where possible
Colin Ian King (1):
drm/amdgpu: avoid out of bounds access on array interrupt_status_offsets
Frank Min (1):
drm/amdgpu:add fw version entry to info
Huang Rui (3):
drm/amdgpu: implement raster configuration for gfx v6
drm/amdgpu: implement raster configuration for gfx v7
drm/amdgpu: implement raster configuration for gfx v8
Markus Elfring (1):
drm/amdgpu: Use kmalloc_array() in amdgpu_debugfs_gca_config_read()
Monk Liu (3):
drm/amdgpu:changes of virtualization cases probe (v3)
drm/amdgpu:determine if vPost is needed indeed
drm/amdgpu:cleanup virt related define
Rex Zhu (23):
drm/amd/powerplay: fix mclk not switching back after multi-head was disabled
drm/amd/powerplay: fix potential issue of array access violation
drm/amd/powerplay: add parameter of the mclk switch latency time
drm/amd/powerplay: add common interface in smumgr to help to visit fw image.
drm/amd/powerplay: implement smu7 hwmgr to manager asics with smu ip version 7.
drm/amd/powerplay: implement fw image related smum interface for Polaris.
drm/amd/powerplay: use smu7 hwmgr to manager polaris10/11
drm/amd/powerplay: implement fw image related smu interface for Fiji.
drm/amd/powerplay: use smu7 hwmgr to manager fiji
drm/amd/powerplay: implement fw image related smum interface for tonga.
drm/amd/powerplay: use smu7_hwmgr to manager tonga.
drm/amd/powerplay: implement smu7_smumgr for asics with smu ip version 7.
drm/amd/powerplay: use smu7 common functions and data on Tonga.
drm/amd/powerplay: use smu7 common functions and data on Polars10.
drm/amd/powerplay: use smu7 common functions and data on Fiji.
drm/amd/powerplay: use smu7 common functions and data on icelannd.
drm/amd/powerplay: implement fw related smu interface for iceland.
drm/amd/powerplay: use smu7 hwmgr to manager iceland
drm/amd/powerplay: delete useless files.
drm/amd/powerplay: export function to help to set cg by smu.
drm/amdgpu: set system clock gating for tonga/polaris.
drm/amdgpu: set gfx clock gating for tonga/polaris.
drm/amdgpu: use powerplay module for dgpu in Vi.
Tom St Denis (5):
drm/amd/powerplay: Add read_sensor() callback to hwmgr (v3)
drm/amd/amdgpu: Hook up read_sensor() to debugfs (v2)
drm/amd/powerplay: Replace per-asic print_performance with generic
drm/amd/amdgpu: Remove division from vblank_wait
drm/amd/amdgpu: Clean up afmt allocation in DCEv6. (v2)
drivers/gpu/drm/amd/amdgpu/Makefile | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 28 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 11 +
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 -
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 9 +
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 42 +
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 118 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 62 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 13 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 1 +
.../amdgpu_virt.h} | 45 +-
drivers/gpu/drm/amd/amdgpu/cik.c | 14 +-
drivers/gpu/drm/amd/amdgpu/cikd.h | 36 +
drivers/gpu/drm/amd/amdgpu/cz_smc.c | 7 -
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 8 +-
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 32 +-
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 8 +-
drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 6 +-
drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 186 -
drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 863 ---
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 131 +-
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 160 +-
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 245 +-
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +-
drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 200 -
drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 677 ---
drivers/gpu/drm/amd/amdgpu/si.c | 14 +-
drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 186 -
drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 862 ---
drivers/gpu/drm/amd/amdgpu/vi.c | 91 +-
drivers/gpu/drm/amd/amdgpu/vid.h | 37 +
drivers/gpu/drm/amd/include/asic_reg/si/sid.h | 35 +
drivers/gpu/drm/amd/include/cgs_common.h | 1 +
drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 120 +-
.../drm/amd/powerplay/eventmgr/eventactionchains.c | 2 +
drivers/gpu/drm/amd/powerplay/eventmgr/psm.c | 3 +-
drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 16 +-
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 175 +-
.../amd/powerplay/hwmgr/fiji_clockpowergating.c | 121 -
.../drm/amd/powerplay/hwmgr/fiji_dyn_defaults.h | 105 -
drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 5601 -----------------
drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h | 350 --
.../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c | 610 --
.../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.h | 81 -
drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.h | 62 -
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 126 +-
.../amd/powerplay/hwmgr/iceland_clockpowergating.c | 119 -
.../amd/powerplay/hwmgr/iceland_clockpowergating.h | 38 -
.../drm/amd/powerplay/hwmgr/iceland_dyn_defaults.h | 41 -
.../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c | 5684 -----------------
.../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.h | 424 --
.../drm/amd/powerplay/hwmgr/iceland_powertune.c | 490 --
.../drm/amd/powerplay/hwmgr/iceland_powertune.h | 74 -
.../gpu/drm/amd/powerplay/hwmgr/iceland_thermal.c | 595 --
.../gpu/drm/amd/powerplay/hwmgr/iceland_thermal.h | 58 -
.../amd/powerplay/hwmgr/polaris10_dyn_defaults.h | 62 -
.../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 5290 ----------------
.../drm/amd/powerplay/hwmgr/polaris10_thermal.c | 716 ---
.../drm/amd/powerplay/hwmgr/polaris10_thermal.h | 62 -
..._clockpowergating.c => smu7_clockpowergating.c} | 160 +-
..._clockpowergating.h => smu7_clockpowergating.h} | 25 +-
.../drm/amd/powerplay/hwmgr/smu7_dyn_defaults.h | 55 +
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4359 +++++++++++++
.../hwmgr/{polaris10_hwmgr.h => smu7_hwmgr.h} | 241 +-
.../{polaris10_powertune.c => smu7_powertune.c} | 985 ++-
.../{polaris10_powertune.h => smu7_powertune.h} | 43 +-
.../hwmgr/{fiji_thermal.c => smu7_thermal.c} | 258 +-
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 58 +
.../amd/powerplay/hwmgr/tonga_clockpowergating.c | 350 --
.../drm/amd/powerplay/hwmgr/tonga_dyn_defaults.h | 107 -
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 6371 --------------------
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 402 --
.../gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c | 495 --
.../gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c | 590 --
.../gpu/drm/amd/powerplay/hwmgr/tonga_thermal.h | 61 -
drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 19 +-
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 4 +-
.../gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h | 3 +-
.../iceland_smum.h => powerplay/inc/smu7_common.h} | 43 +-
drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h | 412 ++
drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 70 +
drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 5 +-
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 2374 ++++++++
.../fiji_smum.h => powerplay/smumgr/fiji_smc.h} | 41 +-
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 612 +-
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 32 +-
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 2576 ++++++++
.../iceland_smc.h} | 26 +-
.../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 613 +-
.../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 63 +-
.../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 2287 +++++++
.../smumgr/polaris10_smc.h} | 32 +-
.../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 703 +--
.../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 41 +-
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 589 ++
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 87 +
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 101 +-
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 3207 ++++++++++
.../tonga_powertune.h => smumgr/tonga_smc.h} | 56 +-
.../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 672 +--
.../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h | 46 +-
drivers/gpu/drm/radeon/radeon_acpi.c | 17 +
drivers/gpu/drm/radeon/radeon_atpx_handler.c | 5 +
drivers/gpu/drm/radeon/radeon_device.c | 11 +-
106 files changed, 18603 insertions(+), 35885 deletions(-)
rename drivers/gpu/drm/amd/{powerplay/hwmgr/polaris10_clockpowergating.h => amdgpu/amdgpu_virt.h} (52%)
delete mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
delete mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_smc.c
delete mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
delete mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_smc.c
delete mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_dpm.c
delete mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_smc.c
mode change 100644 => 100755 drivers/gpu/drm/amd/include/cgs_common.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_clockpowergating.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_dyn_defaults.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_clockpowergating.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_clockpowergating.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_dyn_defaults.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_powertune.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_powertune.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_thermal.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_thermal.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_dyn_defaults.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.h
rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_clockpowergating.c => smu7_clockpowergating.c} (76%)
rename drivers/gpu/drm/amd/powerplay/hwmgr/{fiji_clockpowergating.h => smu7_clockpowergating.h} (62%)
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_dyn_defaults.h
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_hwmgr.h => smu7_hwmgr.h} (59%)
rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_powertune.c => smu7_powertune.c} (62%)
rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_powertune.h => smu7_powertune.h} (64%)
rename drivers/gpu/drm/amd/powerplay/hwmgr/{fiji_thermal.c => smu7_thermal.c} (65%)
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_clockpowergating.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_dyn_defaults.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.h
rename drivers/gpu/drm/amd/{amdgpu/iceland_smum.h => powerplay/inc/smu7_common.h} (66%)
create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h
create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
rename drivers/gpu/drm/amd/{amdgpu/fiji_smum.h => powerplay/smumgr/fiji_smc.h} (53%)
mode change 100644 => 100755 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
rename drivers/gpu/drm/amd/powerplay/{hwmgr/tonga_clockpowergating.h => smumgr/iceland_smc.h} (63%)
create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
rename drivers/gpu/drm/amd/{amdgpu/tonga_smum.h => powerplay/smumgr/polaris10_smc.h} (58%)
create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h
create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
rename drivers/gpu/drm/amd/powerplay/{hwmgr/tonga_powertune.h => smumgr/tonga_smc.h} (53%)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [pull] radeon and amdgpu drm-next-4.9
@ 2016-09-28 21:05 Alex Deucher
0 siblings, 0 replies; 10+ messages in thread
From: Alex Deucher @ 2016-09-28 21:05 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
airlied-Re5JQEeQqe8AvxtiuMwx3w
Cc: Alex Deucher
Hi Dave,
Some additional fixes for 4.9:
- The rest of Christian's GTT rework which fixes a long standing bug
in the GPUVM code among other things
- Changes to the pci shutdown callbacks for certain hypervisors
- Fix hpd interrupt storms on eDP panels which have the hpd interrupt
enabled by the bios
- misc cleanups and bug fixes
The following changes since commit beb86f29c9c7f2d04f9a42c4c61cc469c3689779:
drm/amd/amdgpu: Clean up afmt allocation in DCEv6. (v2) (2016-09-22 14:15:59 -0400)
are available in the git repository at:
git://people.freedesktop.org/~agd5f/linux drm-next-4.9
for you to fetch changes up to a481daa88fd4d6b54f25348972bba10b5f6a84d0:
drm/radeon: always apply pci shutdown callbacks (2016-09-28 16:16:27 -0400)
----------------------------------------------------------------
Alex Deucher (11):
drm/amdgpu: add version bump for raster config programming
drm/amdgpu/vce: take all rings into account for idle checks
drm/amdgpu/si/dpm: sync up quirks from radeon
drm/radeon/si/dpm: fix phase shedding setup
drm/amdgpu/si/dpm: fix phase shedding setup
drm/amdgpu/dce10: disable hpd on local panels
drm/amdgpu/dce11: disable hpd on local panels
drm/amdgpu/dce8: disable hpd on local panels
drm/amdgpu/dce6: disable hpd on local panels
drm/amdgpu: always apply pci shutdown callbacks (v2)
drm/radeon: always apply pci shutdown callbacks
Christian König (13):
drm/amdgpu: fix addr handling in amdgpu_vm_bo_update_mapping
drm/amdgpu: add a custom GTT memory manager v2
drm/amdgpu: remove unused member from struct amdgpu_bo
drm/amdgpu: rename all rbo variable to abo v2
drm/amdgpu: allocate GTT space for shadow VM page tables
drm/amdgpu: cleanup VM shadow BO unreferencing
drm/amdgpu: fix initializing the VM last eviction counter
drm/amdgpu: fix initializing the VM BO shadow
drm/amdgpu: fix amdgpu_move_blit on 32bit systems
drm/amdgpu: fix BO move offsets
drm/amdgpu: free userptrs even if GTT isn't bound
drm/amdgpu: fix GART_DEBUGFS define
drm/amdgpu: improve VM PTE trace points
Flora Cui (2):
drm/amdgpu: fix amdgpu_vm_bo_update param error
drm/amdgpu: fix gtt_mgr bo's offset
Grazvydas Ignotas (4):
drm/amdgpu: clear ring pointer in amdgpu_device on teardown
drm/amdgpu: don't leave dangling pointers around
drm/amdgpu/i2c: add const where appropriate
drm/amdgpu/vce3: don't forget to tear down some rings
Nils Wallménius (1):
drm/amdgpu: Constify tables
Rex Zhu (1):
drm/amdgpu: bypass vce clock if vce is idle on Fiji.
Tom St Denis (1):
drm/amd/amdgpu: Various cleanups for DCEv6
drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 42 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 13 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 44 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 239 +++++++++++++++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.h | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 19 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 20 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 58 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 9 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 13 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 67 ++++--
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 59 ++---
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 59 ++---
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 130 +++++------
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 84 +++++---
drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 12 +-
drivers/gpu/drm/amd/amdgpu/si_dpm.c | 15 +-
drivers/gpu/drm/amd/amdgpu/sislands_smc.h | 1 +
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 3 +-
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +-
.../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 12 +-
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 10 +-
.../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 2 +-
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 13 +-
.../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h | 2 +-
drivers/gpu/drm/radeon/radeon_drv.c | 7 +-
drivers/gpu/drm/radeon/si_dpm.c | 2 +-
drivers/gpu/drm/radeon/sislands_smc.h | 1 +
38 files changed, 700 insertions(+), 322 deletions(-)
create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [pull] radeon and amdgpu drm-next-4.9
@ 2016-10-06 17:00 Alex Deucher
0 siblings, 0 replies; 10+ messages in thread
From: Alex Deucher @ 2016-10-06 17:00 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
airlied-Re5JQEeQqe8AvxtiuMwx3w
Cc: Alex Deucher
Hi Dave,
Just some misc bug fixes for 4.9.
The following changes since commit c2cbc38b9715bd8318062e600668fc30e5a3fbfa:
drm: virtio: reinstate drm_virtio_set_busid() (2016-10-04 13:10:30 +1000)
are available in the git repository at:
git://people.freedesktop.org/~agd5f/linux drm-next-4.9
for you to fetch changes up to 8036617e92e3fad49eef9bbe868b661c58249aff:
drm/amdgpu: revert "use more than 64KB fragment size if possible" (2016-10-06 12:39:04 -0400)
----------------------------------------------------------------
Alex Deucher (3):
drm/amdgpu: remove DRM_AMD_POWERPLAY
drm/amdgpu/vce: add support for hw config packet (v2)
drm/amdgpu/virtual_dce: adjust config ifdef
Christian König (1):
drm/amdgpu: revert "use more than 64KB fragment size if possible"
Grazvydas Ignotas (3):
drm/amdgpu: also track late init state
drm/amdgpu/dce11: add missing drm_mode_config_cleanup call
drm/amdgpu: warn if dp aux is still attached on free
Huang Rui (1):
drm/amdgpu: clean up to set fw_offset as 0 twice
Mario Kleiner (2):
drm/radeon: Slightly more robust flip completion handling for < DCE-4
drm/radeon: Prevent races on pre DCE4 between flip submission and completion.
drivers/gpu/drm/amd/amdgpu/Kconfig | 1 -
drivers/gpu/drm/amd/amdgpu/Makefile | 4 ---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +++
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 --
drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 13 +------
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 -
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 14 ++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 12 +++----
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 +
drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 +--
drivers/gpu/drm/amd/powerplay/Kconfig | 6 ----
drivers/gpu/drm/radeon/atombios_crtc.c | 4 +--
drivers/gpu/drm/radeon/radeon_display.c | 47 ++++++++++++++++++--------
drivers/gpu/drm/radeon/rv515.c | 3 +-
17 files changed, 67 insertions(+), 55 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/powerplay/Kconfig
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [pull] radeon and amdgpu drm-next-4.9
@ 2016-10-14 17:18 Alex Deucher
0 siblings, 0 replies; 10+ messages in thread
From: Alex Deucher @ 2016-10-14 17:18 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
airlied-Re5JQEeQqe8AvxtiuMwx3w
Cc: Alex Deucher
Hi Dave,
Fixes for radeon and amdgpu for 4.9:
- allow an additional reg in the SI reg checker
- fix thermal sensor readback on CZ/ST
- misc bug fixes
The following changes since commit 69405d3da98b48633b78a49403e4f9cdb7c6a0f5:
Merge tag 'topic/drm-misc-2016-10-11' of git://anongit.freedesktop.org/drm-intel into drm-next (2016-10-12 06:07:38 +1000)
are available in the git repository at:
git://people.freedesktop.org/~agd5f/linux drm-next-4.9
for you to fetch changes up to f28a9b65c9e3697ba8d2ab371fae4fea15638676:
drm/amd/powerplay: fix bug stop dpm can't work on Vi. (2016-10-14 12:10:00 -0400)
----------------------------------------------------------------
Alex Deucher (9):
drm/radeon: fix up dp aux tear down (v2)
drm/radeon: fix modeset tear down code
drm/amdgpu/gfx8: fix CGCG_CGLS handling
drm/amdgpu: clarify UVD/VCE special handling for CG
drm/radeon: change vblank_time's calculation method to reduce computational error.
drm/amdgpu: fix amdgpu_need_full_reset (v2)
drm/amdgpu: disable smu hw first on tear down
drm/amdgpu/powerplay: implement thermal sensor for CZ/ST
drm/amdgpu/dpm: implement thermal sensor for CZ/ST
Arindam Nath (1):
drm/amd/amdgpu: enable clockgating only after late init
Dan Carpenter (1):
drm/amdgpu: potential NULL dereference in debugfs code
Grazvydas Ignotas (1):
drm/amdgpu: use .early_unregister hook to remove DP AUX i2c
Marek Olšák (1):
drm/radeon: allow TA_CS_BC_BASE_ADDR on SI
Nicolai Hähnle (1):
drm/amdgpu: initialize the context reset_counter in amdgpu_ctx_init
Rex Zhu (6):
drm/amdgpu: change vblank_time's calculation method to reduce computational error.
drm/amd/powerplay: fix static checker warnings in iceland_smc.c
drm/amd/powerplay: fix static checker warnings in smu7_hwmgr.c
drm/amd/powerplay: fix static checker warnings in smu7_hwmgr.c
drm/amd/powerplay: notify smu no display by default.
drm/amd/powerplay: fix bug stop dpm can't work on Vi.
Tom St Denis (1):
drm/amdgpu/si_dpm: Limit clocks on HD86xx part
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 13 +++-
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 3 +
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 69 ++++++++++++++++------
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 14 +++--
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 +-
drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 8 ++-
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 12 +---
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 30 ++++++----
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 ++--
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 14 ++---
drivers/gpu/drm/amd/amdgpu/si_dpm.c | 6 ++
drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 14 ++---
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 14 ++---
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 15 +++--
drivers/gpu/drm/amd/include/amd_shared.h | 2 +-
.../drm/amd/powerplay/eventmgr/eventactionchains.c | 1 +
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 18 ++++++
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 53 ++++++++++-------
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 2 +-
drivers/gpu/drm/radeon/r600_dpm.c | 15 ++---
drivers/gpu/drm/radeon/radeon_connectors.c | 17 ++++++
drivers/gpu/drm/radeon/radeon_display.c | 14 ++---
drivers/gpu/drm/radeon/radeon_drv.c | 3 +-
drivers/gpu/drm/radeon/radeon_i2c.c | 3 +-
drivers/gpu/drm/radeon/si.c | 1 +
drivers/gpu/drm/radeon/sid.h | 1 +
26 files changed, 232 insertions(+), 127 deletions(-)
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-10-14 17:18 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-16 20:42 [pull] radeon and amdgpu drm-next-4.9 Alex Deucher
2016-09-16 21:38 ` Lukas Wunner
2016-09-16 22:07 ` Alex Deucher
2016-09-17 10:23 ` Lukas Wunner
[not found] ` <20160917102333.GA1422-JFq808J9C/izQB+pC5nmwQ@public.gmane.org>
2016-09-19 16:19 ` Alex Deucher
-- strict thread matches above, loose matches on Subject: below --
2016-10-14 17:18 Alex Deucher
2016-10-06 17:00 Alex Deucher
2016-09-28 21:05 Alex Deucher
2016-09-22 19:21 Alex Deucher
2016-08-24 21:46 Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.