[pull] amdgpu drm-next-5.4

Submitted by Alex Deucher on Aug. 30, 2019, 9:26 p.m.

Details

Message ID 20190830212650.5055-1-alexander.deucher@amd.com
State New
Headers show

Not browsing as part of any series.

Pull-request download mbox

git pull git://people.freedesktop.org/~agd5f/linux tags/drm-next-5.4-2019-08-30

Commit Message

Alex Deucher Aug. 30, 2019, 9:26 p.m.
Hi Dave, Daniel,

Mostly bug fixes.  The big addition is display support for renoir
which is new for 5.4.  I realize it's a bit late to add it but the
rest of the code for renoir is already in so it would be nice to
get the display part in as well.  If not, let me know, and I'll
respin without it.  Thanks!

The following changes since commit b4d857ded1c50fb2bd1168d6f80ae81397ae468b:

  drm/amd/display: 3.2.48 (2019-08-23 11:46:12 -0500)

are available in the Git repository at:

  git://people.freedesktop.org/~agd5f/linux tags/drm-next-5.4-2019-08-30

for you to fetch changes up to 9c9284f9cee9052da4cad575da8dc5f2bbb31065:

  drm/amdgpu: Move null pointer dereference check (2019-08-30 15:37:17 -0500)

----------------------------------------------------------------
drm-next-5.4-2019-08-30:

amdgpu:
- Add DC support for Renoir
- Add some GPUVM hw bug workarounds
- add support for the smu11 i2c controller
- GPU reset vram lost bug fixes
- Navi1x powergating fixes
- Navi12 power fixes
- Renoir power fixes
- Misc bug fixes and cleanups

----------------------------------------------------------------
Aaron Liu (4):
      drm/amdgpu: fix GFXOFF on Picasso and Raven2
      drm/amd/powerplay: SMU_MSG_OverridePcieParameters is unsupport for APU
      drm/amdgpu: update IH_CHICKEN in oss 4.0 IP header for VG/RV series
      drm/amdgpu: fix no interrupt issue for renoir emu (v2)

Alex Deucher (1):
      drm/amdgpu/virtual_dce: drop error message in hw_init

Andrey Grodzovsky (6):
      drm/amd/display: Fix error message
      drm/amdgpu: Add RAS EEPROM table.
      drm/amd: Import smuio_11_0 headers for EEPROM access on Vega20
      drm/amd/powerplay: Add interface to lock SMU HW I2C.
      drm/amdgpu: Vega20 SMU I2C HW engine controller.
      drm/amdgpu: Handle job is NULL use case in amdgpu_device_gpu_recover

Austin Kim (1):
      drm/amdgpu: Move null pointer dereference check

Bhawanpreet Lakha (20):
      drm/amd/display: Add Renoir registers (v3)
      drm/amd/display: Add Renoir clock registers list
      drm/amd/display: Add Renoir hw_seq register list
      drm/amd/display: Add pp_smu functions for Renoir
      drm/amd/display: Add Renoir irq_services (v2)
      drm/amd/display: Add hubp block for Renoir (v2)
      drm/amd/display: Add Renoir hubbub registers list
      drm/amd/display: Add Renoir Hubbub (v2)
      drm/amd/display: Add Renoir clock manager
      drm/amd/display: Add Renoir resource (v2)
      drm/amd/display: Add Renoir GPIO
      drm/amd/display: Add Renoir DML
      drm/amd/display: Fix register names
      drm/amd/display: Handle Renoir in DC
      drm/amd/display: Handle Renoir in amdgpu_dm (v2)
      drm/amd/display: call update_bw_bounding_box
      drm/amd/display: add dal_asic_id for renoir
      drm/amd/display: add dcn21 core DC changes
      drm/amd/display: build dcn21 blocks
      drm/amd/display: add Renoir to kconfig

Colin Ian King (1):
      drm/amdgpu: fix spelling mistake "jumpimng" -> "jumping"

Dan Carpenter (1):
      drm/amd/powerplay: Fix an off by one in navi10_get_smu_msg_index()

Evan Quan (2):
      drm/amd/powerplay: correct Vega20 dpm level related settings
      drm/amd/powerplay: correct the pp_feature output on Arcturus

Gang Ba (1):
      Revert "drm/amdgpu: free up the first paging queue v2"

Hawking Zhang (1):
      drm/amdgpu: correct in_suspend setting for navi series

Jean Delvare (2):
      drm/amd/amdgpu: hide voltage and power sensors on SI and KV parts
      drm/amdgpu/si: fix ASIC tests

Kai-Heng Feng (1):
      drm/amdgpu: Add APTX quirk for Dell Latitude 5495

Masahiro Yamada (1):
      drm/amd: remove meaningless descending into amd/amdkfd/

Monk Liu (1):
      drm/amdgpu: introduce vram lost for reset (v2)

Petr Cvek (1):
      drm/amdgpu: Fix undefined dm_ip_block for navi12

Prike Liang (4):
      drm/amdgpu: Initialize and update SDMA power gating
      drm/amd/powerplay: regards the APU always enable the dpm feature mask
      drm/amd/powerplay: enable populate DPM clocks table for swSMU APU
      drm/amd/powerplay: add the interface for getting ultimate frequency v3

Roman Li (3):
      drm/amd/display: Correct order of RV family clk managers for Renoir
      drm/amd/display: Add DCN2.1 changes to DML
      drm/amdgpu: Enable DC on Renoir

Tianci.Yin (2):
      drm/amdgpu: keep the stolen memory in visible vram region
      drm/amdgpu/psp: keep TMR in visible vram region for SRIOV

Xiaojie Yuan (4):
      drm/amdgpu: add dummy read for some GCVM status registers
      drm/amdgpu: enable vcn powergating for navi12
      drm/amdgpu: enable athub powergating for navi12
      drm/amd/powerplay: enable jpeg powergating for navi1x

YueHaibing (2):
      drm/amdgpu/display: fix build error without CONFIG_DRM_AMD_DC_DSC_SUPPORT
      drm/amd/display: remove unused function setFieldWithMask

 drivers/gpu/drm/Makefile                           |     1 -
 drivers/gpu/drm/amd/amdgpu/Makefile                |     2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c   |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |    17 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c             |    10 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |    10 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |     3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c     |   493 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h     |    90 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |     6 +-
 drivers/gpu/drm/amd/amdgpu/dce_virtual.c           |    11 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |    12 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |    14 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c             |    15 +
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c              |    19 +-
 drivers/gpu/drm/amd/amdgpu/nv.c                    |    13 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |    24 +-
 drivers/gpu/drm/amd/amdgpu/si.c                    |     6 +-
 drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c         |   724 +
 drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h         |    34 +
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |     8 +
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c             |    18 +-
 drivers/gpu/drm/amd/display/Kconfig                |     8 +
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |    16 +-
 drivers/gpu/drm/amd/display/dc/Makefile            |     3 +
 .../amd/display/dc/bios/command_table_helper2.c    |     5 +
 drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile    |    10 +
 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c   |     9 +
 .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c  |   590 +
 .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h  |    39 +
 .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c        |   200 +
 .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h        |    40 +
 drivers/gpu/drm/amd/display/dc/core/dc.c           |     5 +
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |    12 +
 drivers/gpu/drm/amd/display/dc/dc.h                |     3 +
 .../gpu/drm/amd/display/dc/dce/dce_clock_source.h  |    17 +
 drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h     |    97 +
 .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h    |    73 +
 .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h    |    10 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h  |    35 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c |     4 +
 drivers/gpu/drm/amd/display/dc/dcn21/Makefile      |    10 +
 .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c    |   595 +
 .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h    |   132 +
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c  |   244 +
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.h  |   133 +
 .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c  |  1680 +
 .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.h  |    45 +
 drivers/gpu/drm/amd/display/dc/dm_pp_smu.h         |    47 +
 drivers/gpu/drm/amd/display/dc/dml/Makefile        |     8 +
 .../amd/display/dc/dml/dcn21/display_mode_vba_21.c |  6123 ++
 .../amd/display/dc/dml/dcn21/display_mode_vba_21.h |    32 +
 .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c  |  1823 +
 .../display/dc/dml/dcn21/display_rq_dlg_calc_21.h  |    73 +
 .../gpu/drm/amd/display/dc/dml/display_mode_lib.c  |    19 +
 .../gpu/drm/amd/display/dc/dml/display_mode_lib.h  |     3 +
 drivers/gpu/drm/amd/display/dc/gpio/Makefile       |     7 +
 .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c   |   210 +
 .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.h   |    33 +
 .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c |   386 +
 .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.h |    35 +
 drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c   |     8 +
 drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c |     8 +
 drivers/gpu/drm/amd/display/dc/inc/core_types.h    |     8 +
 drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h    |   125 +
 drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h  |     4 +
 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |     1 +
 drivers/gpu/drm/amd/display/dc/irq/Makefile        |    10 +
 .../amd/display/dc/irq/dcn21/irq_service_dcn21.c   |   374 +
 .../amd/display/dc/irq/dcn21/irq_service_dcn21.h   |    34 +
 drivers/gpu/drm/amd/display/include/dal_asic_id.h  |     5 +
 drivers/gpu/drm/amd/display/include/dal_types.h    |     3 +
 .../amd/display/modules/info_packet/info_packet.c  |    19 -
 .../amd/include/asic_reg/clk/clk_10_0_2_offset.h   |    56 +
 .../amd/include/asic_reg/clk/clk_10_0_2_sh_mask.h  |    73 +
 .../amd/include/asic_reg/dcn/dcn_2_1_0_offset.h    | 13862 +++++
 .../amd/include/asic_reg/dcn/dcn_2_1_0_sh_mask.h   | 56638 +++++++++++++++++++
 .../amd/include/asic_reg/dcn/dpcs_2_1_0_offset.h   |   565 +
 .../amd/include/asic_reg/dcn/dpcs_2_1_0_sh_mask.h  |  3430 ++
 .../amd/include/asic_reg/oss/osssys_4_0_sh_mask.h  |     4 +
 .../include/asic_reg/smuio/smuio_11_0_0_offset.h   |    92 +
 .../include/asic_reg/smuio/smuio_11_0_0_sh_mask.h  |   231 +
 drivers/gpu/drm/amd/include/kgd_pp_interface.h     |     1 +
 drivers/gpu/drm/amd/include/renoir_ip_offset.h     |  1364 +
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c      |    16 +
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c         |    46 +-
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c       |     2 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c |    79 +-
 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h     |    10 +-
 drivers/gpu/drm/amd/powerplay/inc/hwmgr.h          |     1 +
 drivers/gpu/drm/amd/powerplay/inc/smu_types.h      |     1 +
 drivers/gpu/drm/amd/powerplay/navi10_ppt.c         |     5 +-
 drivers/gpu/drm/amd/powerplay/renoir_ppt.c         |    22 +
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c          |    38 +
 drivers/gpu/drm/amd/powerplay/smu_v12_0.c          |    62 +
 drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c |     5 +-
 .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c   |     2 +-
 .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h   |     2 +
 99 files changed, 91412 insertions(+), 140 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/Makefile
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_10_0_2_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_10_0_2_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_1_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_1_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_2_1_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_2_1_0_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/renoir_ip_offset.h

Comments

On Sat, 31 Aug 2019 at 07:27, Alex Deucher <alexdeucher@gmail.com> wrote:
>
> Hi Dave, Daniel,
>
> Mostly bug fixes.  The big addition is display support for renoir
> which is new for 5.4.  I realize it's a bit late to add it but the
> rest of the code for renoir is already in so it would be nice to
> get the display part in as well.  If not, let me know, and I'll
> respin without it.  Thanks!

dim: c072b0c24e6b ("drm/amdgpu: fix GFXOFF on Picasso and Raven2"):
Fixes: SHA1 in not pointing at an ancestor:
dim:     98f58ada2d37 ("drm/amdgpu/gfx9: update pg_flags after
determining if gfx off is possible")
dim: ERROR: issues in commits detected, aborting

b05f65d7720b172b6fde3abfa49ed66837071d45
 seems to be the correct ancestor in my tree.

No problems on the renoir code.

Dave.
On Tue, Sep 3, 2019 at 2:37 AM Dave Airlie <airlied@gmail.com> wrote:
>
> On Sat, 31 Aug 2019 at 07:27, Alex Deucher <alexdeucher@gmail.com> wrote:
> >
> > Hi Dave, Daniel,
> >
> > Mostly bug fixes.  The big addition is display support for renoir
> > which is new for 5.4.  I realize it's a bit late to add it but the
> > rest of the code for renoir is already in so it would be nice to
> > get the display part in as well.  If not, let me know, and I'll
> > respin without it.  Thanks!
>
> dim: c072b0c24e6b ("drm/amdgpu: fix GFXOFF on Picasso and Raven2"):
> Fixes: SHA1 in not pointing at an ancestor:
> dim:     98f58ada2d37 ("drm/amdgpu/gfx9: update pg_flags after
> determining if gfx off is possible")
> dim: ERROR: issues in commits detected, aborting
>
> b05f65d7720b172b6fde3abfa49ed66837071d45
>  seems to be the correct ancestor in my tree.

I cherry-picked that change to -fixes as well:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=98f58ada2d37

Alex

>
> No problems on the renoir code.
>
> Dave.