Merge tag 'amd-drm-next-5.12-2021-01-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

Browse source

amd-drm-next-5.12-2021-01-20:

amdgpu:
- Fix non-x86 build
- W=1 fixes from Lee Jones
- Enable GPU reset on Navy Flounder
- Kernel doc fixes
- SMU workload profile fixes for APUs
- Display updates
- SR-IOV fixes
- Vangogh SMU feature enablment and bug fixes
- GPU reset support for Vangogh
- Misc cleanups

Conflicts:
	drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c

Resolve the conflict by picking the initialization value from amd from
f03e80d2e8 ("drm/amd/display: Initialize stack variable") over the
one Linus picked in 61d791365b ("drm/amd/display: avoid
uninitialized variable warning"). It shouldn't matter.

From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210120060951.22600-1-alexander.deucher@amd.com
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

...

This commit is contained in:

Daniel Vetter 2021-01-20 13:08:18 +01:00

parent 71c46fc33a 4aef0ebc6b

commit a6b8720c2f

141 changed files with 1938 additions and 1103 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

4

MAINTAINERS

View file

2

drivers/gpu/drm/amd/amdgpu/Makefile

View file

53

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

View file

3

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

View file

7

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

View file

2

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

View file

7

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

View file

2

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

View file

191

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

View file

17

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

View file

2

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

View file

176

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

View file

36

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

View file

4

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

View file

1

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

View file

48

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

View file

1

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

View file

1

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

View file

46

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

View file

12

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

View file

3

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

View file

154

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

View file

5

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

View file

11

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

View file

152

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

View file

47

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

View file

54

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

View file

5

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h

View file

4

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

View file

9

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

View file

20

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

View file

4

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

View file

119

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

View file

29

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

View file

20

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

View file

20

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

View file

13

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

View file

3

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

View file

2

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c

View file

48

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

View file

62

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

View file

59

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

View file

42

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

View file

5

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

View file

2

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

View file

3

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

View file

3

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

View file

1

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

View file

8

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

View file

11

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

View file

2

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

View file

8

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

View file

1

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

View file

57

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

View file

6

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

View file

2

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

View file

4

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

View file

9

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

View file

9

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

View file

24

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

View file

2

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

View file

8

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

View file

3

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

View file

15

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

View file

22

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

View file

2

drivers/gpu/drm/amd/display/dc/dce100/Makefile

View file

18

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

View file

2

drivers/gpu/drm/amd/display/dc/dce110/Makefile

View file

55

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

View file

33

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

View file

17

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

View file

17

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

View file

76

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

View file

19

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

View file

19

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

View file

2

drivers/gpu/drm/amd/display/dc/dce112/Makefile

View file

20

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

View file

2

drivers/gpu/drm/amd/display/dc/dce120/Makefile

View file

2

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

View file

6

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

View file

99

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

View file

2

drivers/gpu/drm/amd/display/dc/dce60/Makefile

View file

18

drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c

View file

4

drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c

View file

2

drivers/gpu/drm/amd/display/dc/dce80/Makefile

View file

2

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

View file

2

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

View file

36

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

View file

5

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

View file

1

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

View file

2

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

View file

11

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

View file

1

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

View file

4

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

View file

12

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

View file

1

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

View file

1

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

View file

7

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c

View file

1

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

View file

70

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c

View file

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