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

Browse source

First new feature pull for 4.10.  Highlights:
- Support for multple virtual displays in the virtual dce component
- New VM mgr to support non-contiguous vram buffers
- Support for UVD powergating on additional asics
- Power management improvements
- lots of code cleanup and bug fixes

* 'drm-next-4.10' of git://people.freedesktop.org/~agd5f/linux: (107 commits)
  drm/amdgpu: turn on/off uvd clock when dpm enable/disable on CI
  drm/amdgpu: disable dpm before turn off clock when vce idle.
  drm/amdgpu: enable uvd bypass mode for CI/VI.
  drm/amdgpu: just not load smc firmware if smu is already running
  drm/amdgpu: when suspend, set boot state instand of disable dpm.
  drm/amdgpu: use failed label to handle context init failure
  drm/amdgpu: add amdgpu_ttm_bo_eviction_valuable callback
  drm/ttm: make eviction decision a driver callback v2
  drm/ttm: fix coding style in ttm_bo_driver.h
  drm/radeon/pm: autoswitch power state when in balanced mode
  drm/amd/powerplay: fix spelling mistake and add KERN_WARNING to printks
  drm/amdgpu:new ids flag for preempt
  drm/amdgpu: mark symbols static where possible
  drm/amdgpu: change function declarations and add missing header dependencies
  drm/amdgpu: s/amdgpuCrtc/amdgpu_crtc/ in pageflip code
  drm/amdgpu/atom: remove a bunch of unused functions
  drm/amdgpu: consolidate atom scratch reg handling for hangs
  drm/amdgpu: use amdgpu_bo_[create|free]_kernel for wb
  drm/amdgpu: add VCE VM session tracking
  drm/amdgpu: improve parse_cs handling a bit
  ...

...

This commit is contained in:

Dave Airlie 2016-10-28 10:35:59 +10:00

parent 5481e27f6f 3495a10357

commit a1873c6271

153 changed files with 4293 additions and 4595 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

2

drivers/gpu/drm/amd/amdgpu/Makefile

View file

7

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

View file

852

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

View file

17

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

View file

2

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

View file

95

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

View file

12

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

View file

51

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

View file

93

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

View file

74

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

View file

18

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

View file

456

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

View file

12

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

View file

16

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

View file

443

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

View file

11

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

View file

3

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

View file

3

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

View file

41

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

View file

1

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

View file

3

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

View file

1

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

View file

6

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

View file

62

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

View file

4

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

View file

5

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

View file

71

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

View file

3

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

View file

84

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

View file

11

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

View file

8

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

View file

21

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

View file

185

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

View file

56

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

View file

191

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

View file

1

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

View file

41

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

View file

1

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

View file

11

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

View file

108

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

View file

1

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

View file

392

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

View file

205

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

View file

222

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

View file

1

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

View file

122

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

View file

834

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

View file

2

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

View file

11

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

View file

2

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

View file

49

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

View file

2

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

View file

8

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

View file

28

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

View file

10

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

View file

2

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

View file

135

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

View file

4

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

View file

135

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

View file

3

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

View file

317

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

View file

5

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

View file

293

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

View file

6

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

View file

430

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

View file

3

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

View file

77

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

View file

2

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

View file

146

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

View file

5

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

View file

209

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

View file

3

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

View file

10

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

View file

2

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

View file

20

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

View file

3

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

View file

29

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

View file

4

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

View file

10

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

View file

2

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

View file

25

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

View file

49

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

View file

2

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

View file

58

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

View file

3

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

View file

162

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

View file

2

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

View file

45

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

View file

2

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

View file

65

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

View file

10

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

View file

2

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

View file

10

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

View file

4

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

View file

63

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

View file

2

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

View file

56

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

View file

2

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

View file

90

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

View file

4

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

View file

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