linux/drivers/gpu/drm/amd/amdgpu/cik.c, branch v4.6

Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-next

2016-03-16T22:25:04Z

A few more fixes and cleanups for 4.6: - DCE code cleanups - HDP flush/invalidation fixes - GPUVM fixes - switch to drm_vblank_[on|off] - PX fixes - misc bug fixes * 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux: (50 commits) drm/amdgpu: split pipeline sync out of SDMA vm_flush() as well drm/amdgpu: Revert "add mutex for ba_va->valids/invalids" drm/amdgpu: Revert "add lock for interval tree in vm" drm/amdgpu: Revert "add spin lock to protect freed list in vm (v3)" drm/amdgpu: reserve the PD during unmap and remove drm/amdgpu: Fix two bugs in amdgpu_vm_bo_split_mapping drm/radeon: Don't drop DP 2.7 Ghz link setup on some cards. MAINTAINERS: update radeon entry to include amdgpu as well drm/amdgpu: disable runtime pm on PX laptops without dGPU power control drm/radeon: disable runtime pm on PX laptops without dGPU power control drm/amd/amdgpu: Fix indentation in do_set_base() (DCEv8) drm/amd/amdgpu: make afmt_init cleanup if alloc fails (DCEv8) drm/amd/amdgpu: Move config init flag to bottom of sw_init (DCEv8) drm/amd/amdgpu: Don't proceed into audio_fini if audio is disabled (DCEv8) drm/amd/amdgpu: Fix identation in do_set_base() (DCEv10) drm/amd/amdgpu: Make afmt_init cleanup if alloc fails (DCEv10) drm/amd/amdgpu: Move initialized flag to bottom of sw_init (DCEv10) drm/amd/amdgpu: Don't proceed in audio_fini if disabled (DCEv10) drm/amd/amdgpu: Fix indentation in dce_v11_0_crtc_do_set_base() drm/amd/amdgpu: Make afmt_init() cleanup if alloc fails (DCEv11) ...

Merge drm-fixes into drm-next.

2016-03-13T23:46:02Z

Nouveau wanted this to avoid some worse conflicts when I merge that.

drm/amdgpu: delete set-but-not-read member has_uvd from amdgpu_device

2016-03-08T16:01:39Z

Clean up leftover from radeon code. Signed-off-by: Nils Wallménius Signed-off-by: Alex Deucher

drm/amdgpu: clean up asic level reset for CI

2016-02-10T19:16:53Z

Drop soft reset, always use pci config reset. Reviewed-by: Junwei Zhang Reviewed-by: Christian König Reviewed-by: Ken Wang Signed-off-by: Alex Deucher

drma/dmgpu: move cg and pg flags into shared headers

2016-02-08T15:37:47Z

So they can be used by powerplay. Reviewed-by: Eric Huang Signed-off-by: Alex Deucher

drm/amdgpu/cik: don't mess with aspm if gpu is root bus

2016-02-08T15:37:41Z

Pcie registers may not be available in a virtualized environment. Reviewed-by: monk liu Signed-off-by: Alex Deucher

drm/amdgpu: store pcie gen mask and link width

2015-12-21T21:42:32Z

We'll need this later for pcie dpm. Reviewed-by: Jammy Zhou Signed-off-by: Alex Deucher

drm/amd/powerplay: add basic powerplay framework

2015-12-21T21:42:07Z

amdgpu_pp_ip_funcs is introduced to handle the two code paths, the legacy one and the new powerplay implementation. CONFIG_DRM_AMD_POWERPLAY kernel configuration option is introduced for the powerplay component. v4: squash in fixes v3: register debugfs file when powerplay module enable v2: add amdgpu_ucode_init_bo in hw init when amdgpu_powerplay enable. Signed-off-by: Rex Zhu Signed-off-by: Jammy Zhou Reviewed-by: Alex Deucher

drm/amdgpu: add read_bios_from_rom callback for CI parts

2015-12-02T17:45:58Z

Read the vbios image directly from the rom. Reviewed-by: Jammy Zhou Reviewed-by: Christian König Reviewed-by: Monk Liu Signed-off-by: Alex Deucher

drm/amdgpu: check before checking pci bridge registers

2015-10-06T14:43:16Z

Make sure we are not the root device before attempting to read the pcie bridge registers to check the pcie gen speeed. Fixes a crash when the device is passed through to a VM. Reviewed-by: Christian König Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org