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

Browse source

This is the main 4.8 pull for radeon and amdgpu.  Sorry for the delay,
I meant to send this out last week, but I was moving house.  Lots of
changes here:
- ATPX improvements for better dGPU power control on PX systems
- New power features for CZ/BR/ST
- Pipelined BO moves and evictions in TTM
- GPU scheduler improvements
- GPU reset improvements
- Overclocking on dGPUs with amdgpu
- Lots of code cleanup
- Bug fixes

* 'drm-next-4.8' of git://people.freedesktop.org/~agd5f/linux: (191 commits)
  drm/amd/powerplay: don't add invalid voltage.
  drm/amdgpu: add read/write function for GC CAC programming
  drm/amd/powerplay: add definitions related to di/dt feature for fiji and polaris.
  drm/amd/powerplay: add shared definitions for di/dt feature.
  drm/amdgpu: remove gfx8 registers that vary between asics
  drm/amd/powerplay: add mvdd dpm support.
  drm/amdgpu: get number of shade engine by cgs interface.
  drm/amdgpu: remove more of the ring backup code
  drm/amd/powerplay:  Unify family defines
  drm/amdgpu: clean up ring_backup code, no need more
  drm/amdgpu: ib test first after gpu reset
  drm/amdgpu: recovery hw jobs when gpu reset V3
  drm/amdgpu: abstract amdgpu_vm_is_gpu_reset
  drm/amdgpu: add a bool to specify if needing vm flush V2
  drm/amdgpu: add amd_sched_job_recovery
  drm/amdgpu: force completion for gpu reset
  drm/amdgpu: block ttm first before parking scheduler
  drm/amd: add amd_sched_hw_job_reset
  drm/amd: add parent for sched fence
  drm/amdgpu: remove evict vram
  ...

...

This commit is contained in:

Dave Airlie 2016-07-08 13:42:41 +10:00

parent b33e07731c b1814a1def

commit 6f6e68b383

103 changed files with 3924 additions and 1596 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

96

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

View file

4

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

View file

66

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

View file

3

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

View file

15

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

View file

7

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

View file

41

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

View file

270

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

View file

8

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

View file

28

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

View file

2

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

View file

44

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

View file

2

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

View file

12

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

View file

12

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

View file

1

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

View file

76

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

View file

245

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

View file

3

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

View file

172

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

View file

1

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

View file

215

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

View file

90

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

View file

99

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

View file

15

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

View file

331

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

View file

210

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

View file

1

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

View file

23

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

View file

11

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

View file

1

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

View file

5

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

View file

67

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

View file

103

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

View file

7

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

View file

435

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

View file

1

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

View file

41

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

View file

7

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

View file

46

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

View file

7

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

View file

6

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

View file

13

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

View file

12

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

View file

30

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

View file

29

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

View file

71

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

View file

71

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

View file

14

drivers/gpu/drm/amd/include/amd_pcie.h

View file

11

drivers/gpu/drm/amd/include/amd_shared.h

View file

3

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

View file

108

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

View file

3

drivers/gpu/drm/amd/include/cgs_common.h

View file

151

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

View file

3

drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c

View file

3

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

View file

17

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

View file

374

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

View file

3

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

View file

74

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

View file

15

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

View file

26

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

View file

8

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

View file

6

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

View file

378

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

View file

4

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

View file

59

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

View file

15

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

View file

4

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

View file

20

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

View file

167

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

View file

3

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

View file

3

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

View file

7

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

View file

1

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

View file

10

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

View file

5

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

View file

4

drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h

View file

184

drivers/gpu/drm/amd/scheduler/gpu_scheduler.c

View file

60

drivers/gpu/drm/amd/scheduler/gpu_scheduler.h

View file

81

drivers/gpu/drm/amd/scheduler/sched_fence.c

View file

13

drivers/gpu/drm/ast/ast_ttm.c

View file

11

drivers/gpu/drm/bochs/bochs_mm.c

View file

13

drivers/gpu/drm/cirrus/cirrus_ttm.c

View file

13

drivers/gpu/drm/mgag200/mgag200_ttm.c

View file

7

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

10

drivers/gpu/drm/qxl/qxl_ttm.c

View file

17

drivers/gpu/drm/radeon/cik.c

View file

7

drivers/gpu/drm/radeon/evergreen_cs.c

View file

1

drivers/gpu/drm/radeon/evergreend.h

View file

65

drivers/gpu/drm/radeon/radeon_atpx_handler.c

View file

15

drivers/gpu/drm/radeon/radeon_connectors.c

View file

16

drivers/gpu/drm/radeon/radeon_drv.c

View file

10

drivers/gpu/drm/radeon/radeon_ttm.c

View file

45

drivers/gpu/drm/radeon/si.c

View file

164

drivers/gpu/drm/ttm/ttm_bo.c

View file

112

drivers/gpu/drm/ttm/ttm_bo_util.c

View file

19

drivers/gpu/drm/ttm/ttm_bo_vm.c

View file

19

drivers/gpu/drm/ttm/ttm_tt.c

View file

6

drivers/gpu/drm/virtio/virtgpu_ttm.c

View file

Some files were not shown because too many files have changed in this diff Show more