Merge tag 'drm-next-5.5-2019-11-01' of git://people.freedesktop.org/~agd5f/linux into drm-next

Browse source

drm-next-5.5-2019-11-01:

amdgpu:
- Add EEPROM support for Arcturus
- Enable VCN encode support for Arcturus
- Misc PSP fixes
- Misc DC fixes
- swSMU cleanup

amdkfd:
- Misc cleanups
- Fix typo in cu bitmap parsing

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191101190607.3763-1-alexander.deucher@amd.com

...

This commit is contained in:

Dave Airlie 2019-11-04 10:22:53 +10:00

parent 2ef4144d1e 5ab5e4e60a

commit 8a86b00a43

100 changed files with 3131 additions and 1153 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

8

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

View file

4

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

View file

3

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

View file

3

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

View file

3

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

View file

4

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

View file

23

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

View file

6

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

View file

6

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

View file

5

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

View file

3

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

View file

3

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

View file

4

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

View file

36

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

View file

11

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

View file

56

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

View file

9

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

View file

20

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

View file

10

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

View file

19

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

View file

9

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

View file

2

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

View file

9

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

View file

9

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

View file

1

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

View file

9

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

View file

3

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

View file

10

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

View file

1

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

View file

11

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

View file

1

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

View file

3

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

View file

2

drivers/gpu/drm/amd/amdkfd/kfd_crat.c

View file

5

drivers/gpu/drm/amd/amdkfd/kfd_device.c

View file

47

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

View file

1

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h

View file

140

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

View file

2

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

View file

21

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

View file

1

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

View file

48

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

View file

14

drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c

View file

4

drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c

View file

10

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c

View file

38

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c

View file

178

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c

View file

7

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h

View file

2

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c

View file

12

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

View file

194

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

View file

24

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

View file

54

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

View file

9

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

View file

3

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

View file

4

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

View file

10

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

View file

37

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

View file

11

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

View file

37

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

View file

37

drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c

View file

37

drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c

View file

37

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

View file

22

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

View file

4

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

View file

28

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

View file

33

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c

View file

4

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

View file

262

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

View file

31

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

View file

79

drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c

View file

4

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

View file

3

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c

View file

3

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c

View file

1

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

View file

3

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

View file

1

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

View file

4

drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c

View file

4

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

View file

3

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

View file

2

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

View file

51

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

View file

2

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

View file

12

drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h

View file

722

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

View file

450

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

View file

4

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

View file

331

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

View file

28

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

View file

122

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

View file

41

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

View file

66

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

View file

32

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

View file

204

drivers/gpu/drm/amd/powerplay/smu_internal.h

View file

196

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

View file

74

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

View file

76

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

View file

8

drivers/gpu/drm/radeon/cik.c

View file

14

drivers/gpu/drm/radeon/radeon_drv.c

View file

19

drivers/gpu/drm/scheduler/sched_main.c

View file