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

Browse source

- lots of code cleanup
- lots of bug fixes
- expose rpm based fan info via hwmon
- lots of clock and powergating fixes
- SI register header cleanup and conversion to common format used by newer asics

* 'drm-next-4.10' of git://people.freedesktop.org/~agd5f/linux: (54 commits)
  drm/amdgpu: drop is_display_hung from display funcs
  drm/amdgpu/uvd: reduce IB parsing overhead on UVD5+ (v2)
  drm/amdgpu/uvd: consolidate code for fetching addr from ctx
  drm/amdgpu: Disable DPM in virtualization
  drm/amdgpu: use AMDGPU_GEM_CREATE_VRAM_CLEARED for VM PD/PTs (v2)
  drm/amdgpu: improve AMDGPU_GEM_CREATE_VRAM_CLEARED handling (v2)
  drm/amdgpu: fix error handling in amdgpu_bo_create_restricted
  drm/amdgpu: fix amdgpu_fill_buffer (v2)
  drm/amdgpu: remove amdgpu_irq_get_delayed
  amdgpu: Wrap dev_err() calls on vm faults with printk_ratelimit()
  amdgpu: Use dev_err() over vanilla printk() in vm_decode_fault()
  drm/amd/amdgpu: port of DCE v6 to new headers (v3)
  drm/amdgpu: cleanup unused iterator members for sdma v2.4
  drm/amdgpu: cleanup unused iterator members for sdma v3
  drm/amdgpu:impl vgt_flush for VI(V5)
  drm/amdgpu: enable uvd mgcg for Fiji.
  drm/amdgpu: refine cz uvd clock gate logic.
  drm/amdgpu: change log level to KERN_INFO in ci_dpm.c
  drm/amdgpu: always un-gate UVD REGS path.
  drm/amdgpu/sdma: fix typo in packet setup
  ...

...

This commit is contained in:

Dave Airlie 2016-12-06 11:01:33 +10:00

parent 770ac20413 e7b8243d3e

commit 17f1dfd01c

66 changed files with 55685 additions and 1205 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

drivers/gpu/drm/amd/amdgpu/amdgpu.h

View file

2

drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c

View file

43

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

View file

4

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

View file

7

drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h

View file

14

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

View file

39

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

View file

9

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c

View file

3

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h

View file

2

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

View file

47

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

View file

21

drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

View file

6

drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c

View file

3

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h

View file

3

drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c

View file

69

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

View file

43

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

View file

99

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

View file

2

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c

View file

12

drivers/gpu/drm/amd/amdgpu/ci_dpm.c

View file

8

drivers/gpu/drm/amd/amdgpu/cz_dpm.c

View file

1

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

View file

1

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

View file

515

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

View file

1

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

View file

6

drivers/gpu/drm/amd/amdgpu/dce_virtual.c

View file

770

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c

View file

21

drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c

View file

23

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

View file

339

drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c

View file

18

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c

View file

18

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

View file

2

drivers/gpu/drm/amd/amdgpu/kv_dpm.c

View file

4

drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c

View file

4

drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c

View file

272

drivers/gpu/drm/amd/amdgpu/si_enums.h

View file

42

drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c

View file

113

drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c

View file

18

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c

View file

7

drivers/gpu/drm/amd/amdgpu/vi.c

View file

661

drivers/gpu/drm/amd/include/asic_reg/bif/bif_3_0_d.h

View file

8127

drivers/gpu/drm/amd/include/asic_reg/bif/bif_3_0_sh_mask.h

View file

File diff suppressed because it is too large Load diff

4457

drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h

View file

File diff suppressed because it is too large Load diff

9836

drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h

View file

File diff suppressed because it is too large Load diff

1784

drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h

View file

12821

drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_sh_mask.h

View file

File diff suppressed because it is too large Load diff

1274

drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_d.h

View file

11895

drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_sh_mask.h

View file

File diff suppressed because it is too large Load diff

275

drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h

View file

1079

drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_sh_mask.h

View file

148

drivers/gpu/drm/amd/include/asic_reg/smu/smu_6_0_d.h

View file

715

drivers/gpu/drm/amd/include/asic_reg/smu/smu_6_0_sh_mask.h

View file

96

drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_d.h

View file

795

drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_sh_mask.h

View file

64

drivers/gpu/drm/amd/include/asic_reg/vce/vce_1_0_d.h

View file

99

drivers/gpu/drm/amd/include/asic_reg/vce/vce_1_0_sh_mask.h

View file

72

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

View file

4

drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.c

View file

31

drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c

View file

4

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_clockpowergating.c

View file

14

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

View file

5

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c

View file

3

drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h

View file

6

drivers/gpu/drm/amd/powerplay/inc/hwmgr.h

View file

6

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c

View file

3

drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c

View file