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

Browse source

- Continued cleanup and restructuring of powerplay
- Fetch VRAM type from vbios rather than hardcoding for SOC15 asics
- Allow ttm to drop its backing store when drivers don't need it
- DC bandwidth calc updates
- Enable DC backlight control pre-DCE11 asics
- Enable DC on all supported asics
- DC Fixes for planes due to the way our hw is ordered vs what drm expects
- DC CTM/regamma fixes
- Misc cleanup and bug fixes

* 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux: (89 commits)
  amdgpu/dm: Default PRE_VEGA ASIC support to 'y'
  drm/amd/pp: Remove the cgs wrapper for notify smu version on APU
  drm/amd/display: fix dereferencing possible ERR_PTR()
  drm/amd/display: Refine disable VGA
  drm/amdgpu: Improve documentation of bo_ptr in amdgpu_bo_create_kernel
  drm/radeon: Don't turn off DP sink when disconnected
  drm/amd/pp: Rename file name cz_* to smu8_*
  drm/amd/pp: Replace function/struct name cz_* with smu8_*
  drm/amd/pp: Remove unneeded void * casts in cz_hwmgr.c/cz_smumgr.c
  drm/amd/pp: Mv cz uvd/vce pg/dpm functions to cz_hwmgr.c
  drm/amd/pp: Remove dead header file pp_asicblocks.h
  drm/amd/pp: Delete dead code on cz_clockpowergating.c
  drm/amdgpu: Call amdgpu_ucode_fini_bo in amd_powerplay.c
  drm/amdgpu: Remove wrapper layer of smu ip functions
  drm/amdgpu: Don't compared ip_block_type with ip_block_index
  drm/amdgpu: Plus NULL function pointer check
  drm/amd/pp: Move helper functions to smu_help.c
  drm/amd/pp: Replace rv_* with smu10_*
  drm/amd/pp: Fix function parameter not correct
  drm/amd/pp: Add rv_copy_table_from/to_smc to smu backend function table
  ...

...

This commit is contained in:

Dave Airlie 2018-03-21 11:46:05 +10:00

parent 963976cfe9 6da2b9332c

commit 287d2ac36b

159 changed files with 8698 additions and 8117 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

3

drivers/gpu/drm/amd/amdgpu/Makefile

View file

12

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

View file

5

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

View file

4

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

View file

95

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

View file

1

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

View file

8

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

View file

5

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

View file

29

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

View file

45

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

View file

9

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

View file

8

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

View file

43

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

View file

30

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

View file

59

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

View file

11

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

View file

2

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

View file

288

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

View file

9

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

View file

9

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

View file

11

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

View file

28

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

View file

8

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

View file

4

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

View file

5

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

View file

16

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

View file

19

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

View file

7

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

View file

8

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

View file

8

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

View file

8

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

View file

8

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

View file

8

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

View file

8

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

View file

16

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

View file

196

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

View file

7

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

View file

18

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

View file

8

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

View file

16

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

View file

3

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

View file

12

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

View file

4

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

View file

2

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

View file

4

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

View file

4

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

View file

18

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

View file

2

drivers/gpu/drm/amd/display/Kconfig

View file

129

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

View file

15

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c

View file

3

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

View file

3

drivers/gpu/drm/amd/display/dc/basics/logger.c

View file

6

drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c

View file

5

drivers/gpu/drm/amd/display/dc/bios/command_table2.c

View file

2

drivers/gpu/drm/amd/display/dc/bios/command_table2.h

View file

160

drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c

View file

23

drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c

View file

20

drivers/gpu/drm/amd/display/dc/core/dc.c

View file

32

drivers/gpu/drm/amd/display/dc/core/dc_debug.c

View file

7

drivers/gpu/drm/amd/display/dc/core/dc_link.c

View file

5

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

View file

3

drivers/gpu/drm/amd/display/dc/core/dc_stream.c

View file

9

drivers/gpu/drm/amd/display/dc/dc.h

View file

12

drivers/gpu/drm/amd/display/dc/dc_hw_types.h

View file

7

drivers/gpu/drm/amd/display/dc/dc_stream.h

View file

18

drivers/gpu/drm/amd/display/dc/dc_types.h

View file

35

drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h

View file

10

drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c

View file

24

drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h

View file

3

drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c

View file

50

drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c

View file

28

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

View file

87

drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c

View file

1

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c

View file

16

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h

View file

9

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c

View file

261

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

View file

7

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c

View file

1

drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c

View file

2

drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h

View file

1

drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h

View file

17

drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h → drivers/gpu/drm/amd/display/dc/dml/dml_logger.h

View file

2

drivers/gpu/drm/amd/display/dc/inc/core_types.h

View file

6

drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h

View file

3

drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h

View file

1

drivers/gpu/drm/amd/display/include/logger_types.h

View file

6

drivers/gpu/drm/amd/display/modules/color/color_gamma.c

View file

155

drivers/gpu/drm/amd/display/modules/freesync/freesync.c

View file

9

drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h

View file

56

drivers/gpu/drm/amd/powerplay/inc/pp_asicblocks.h → drivers/gpu/drm/amd/display/modules/inc/mod_stats.h

View file

334

drivers/gpu/drm/amd/display/modules/stats/stats.c

View file

3

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

View file

70

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

View file

284

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

View file

619

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

View file

8

drivers/gpu/drm/amd/powerplay/hwmgr/Makefile

View file

209

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

View file

36

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

View file

577

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

View file

545

drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c → drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c

View file

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