[pull] amdgpu drm-fixes-5.16

[pull] amdgpu drm-fixes-5.16

[Alex Deucher]

Hi Dave, Daniel,

Fixes for 5.16.

The following changes since commit a687efed194bdc185fd7cb33920fe8b4e60ecb9e:

  Merge tag 'drm-intel-fixes-2021-12-02' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2021-12-03 05:59:31 +1000)

are available in the Git repository at:

  https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.16-2021-12-08

for you to fetch changes up to 0755c38eb007196a5f779298b4a5f46c4eec41d2:

  drm/amd/display: prevent reading unitialized links (2021-12-08 23:24:08 -0500)

----------------------------------------------------------------
amd-drm-fixes-5.16-2021-12-08:

amdgpu:
- DPIA fix
- eDP fix

----------------------------------------------------------------
Mikita Lipski (1):
      drm/amd/display: prevent reading unitialized links

Nicholas Kazlauskas (1):
      drm/amd/display: Fix DPIA outbox timeout after S3/S4/reset

 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ++++++-
 drivers/gpu/drm/amd/display/dc/dc_link.h          | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

[pull] amdgpu drm-fixes-5.16

[Alex Deucher]

Hi Dave, Daniel,

One small suspend/resume fix, and the rest is restoring the runtime pm behavior
that changed for some people when efifb dropped its extra runtime pm reference.
Unfortunately the issue has not been something we've been able to reproduce
consistently.  The patches here basically re-enable the previous behavior, but
in the driver if the device is the one that was used by the firmware
framebuffer.  It is limited to the device used by firmware since I don't want to
regress hybrid graphics laptops and other systems that have been working fine
years.  The first patch adds a helper to fbmem.c to determine if the adapter is
the one used by firmware.  This needs a more indepth analysis, but with the
holidays and the late state of the 5.16 cycle, this seems like the best option.

The following changes since commit ce9b333c73a5a8707f2f446a837a6ca743ddcffd:

  Merge branch 'drm-misc-fixes' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes (2021-12-31 11:40:29 +1000)

are available in the Git repository at:

  https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.16-2021-12-31

for you to fetch changes up to b95dc06af3e683d6b7ddbbae178b2b2a21ee8b2b:

  drm/amdgpu: disable runpm if we are the primary adapter (2021-12-31 08:57:45 -0500)

----------------------------------------------------------------
amd-drm-fixes-5.16-2021-12-31:

amdgpu:
- Suspend/resume fix
- Restore runtime pm behavior with efifb

----------------------------------------------------------------
Alex Deucher (2):
      fbdev: fbmem: add a helper to determine if an aperture is used by a fw fb
      drm/amdgpu: disable runpm if we are the primary adapter

Evan Quan (1):
      drm/amd/pm: keep the BACO feature enabled for suspend

 drivers/gpu/drm/amd/amdgpu/amdgpu.h       |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c   | 28 ++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c   |  6 ++++
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c |  8 +++++-
 drivers/video/fbdev/core/fbmem.c          | 47 +++++++++++++++++++++++++++++++
 include/linux/fb.h                        |  1 +
 6 files changed, 90 insertions(+), 1 deletion(-)

Re: [pull] amdgpu drm-fixes-5.16

[Alex Deucher]

On Thu, Dec 30, 2021 at 12:29 AM Dave Airlie <airlied@gmail.com> wrote:
>
> On Thu, 30 Dec 2021 at 01:51, Alex Deucher <alexander.deucher@amd.com> wrote:
> >
> > Hi Dave, Daniel,
>
> Just FYI on merging this into tip I got a conflict I'm not sure what
> answer is right.
>
> fixes has:
> ee2698cf79cc759a397c61086c758d4cc85938bf
> Author: Angus Wang <angus.wang@amd.com>
> Date:   Thu Dec 9 17:27:01 2021 -0500
>
>     drm/amd/display: Changed pipe split policy to allow for
> multi-display pipe split
>
> next has:
> 1edf5ae1fdaffb67c1b93e98df670cbe535d13cf
> Author: Zhan Liu <Zhan.Liu@amd.com>
> Date:   Mon Nov 8 19:31:00 2021 -0500
>
>     drm/amd/display: enable seamless boot for DCN301
>
> -.pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP,
> fixes is +.pipe_split_policy = MPC_SPLIT_DYNAMIC,
> next is +.pipe_split_policy = MPC_SPLIT_AVOID,
>
> I've chosen the -fixes answer for now, but it would be good to have
> someone review it before Linus merges.

It should ultimately be MPC_SPLIT_DYNAMIC.  -next has an extra patch
which changes it to an intermediate value before this patch changes it
to MPC_SPLIT_DYNAMIC.

Alex


>
> Dave.

Re: [pull] amdgpu drm-fixes-5.16

[Dave Airlie]

On Thu, 30 Dec 2021 at 01:51, Alex Deucher <alexander.deucher@amd.com> wrote:
>
> Hi Dave, Daniel,

Just FYI on merging this into tip I got a conflict I'm not sure what
answer is right.

fixes has:
ee2698cf79cc759a397c61086c758d4cc85938bf
Author: Angus Wang <angus.wang@amd.com>
Date:   Thu Dec 9 17:27:01 2021 -0500

    drm/amd/display: Changed pipe split policy to allow for
multi-display pipe split

next has:
1edf5ae1fdaffb67c1b93e98df670cbe535d13cf
Author: Zhan Liu <Zhan.Liu@amd.com>
Date:   Mon Nov 8 19:31:00 2021 -0500

    drm/amd/display: enable seamless boot for DCN301

-.pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP,
fixes is +.pipe_split_policy = MPC_SPLIT_DYNAMIC,
next is +.pipe_split_policy = MPC_SPLIT_AVOID,

I've chosen the -fixes answer for now, but it would be good to have
someone review it before Linus merges.

Dave.

[pull] amdgpu drm-fixes-5.16

[Alex Deucher]

Hi Dave, Daniel,

Fixes for 5.16.  A little bigger than usual since it's two weeks worth of
fixes.  We have a fix for the runtime pm regression with efifb, but we
are currently testing some less invasive changes.  See:
https://gitlab.freedesktop.org/drm/amd/-/issues/1840
https://bugzilla.kernel.org/show_bug.cgi?id=215203
Look out for another PR in the next few days with a fix for that.  The
current fix involves a change to fbmem.c.  It would be nice to get an
A-b or R-b on that if the newer fix doesn't work out.
https://patchwork.kernel.org/project/dri-devel/list/?series=601558

The following changes since commit a2fbfd517117157e99160ff1b39b171872dcba07:

  Merge tag 'amd-drm-fixes-5.16-2021-12-15' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-12-17 15:01:01 +1000)

are available in the Git repository at:

  https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.16-2021-12-29

for you to fetch changes up to ee2698cf79cc759a397c61086c758d4cc85938bf:

  drm/amd/display: Changed pipe split policy to allow for multi-display pipe split (2021-12-28 17:02:31 -0500)

----------------------------------------------------------------
amd-drm-fixes-5.16-2021-12-29:

amdgpu:
- Fencing fix
- XGMI fix
- VCN regression fix
- IP discovery regression fixes
- Fix runpm documentation
- Suspend/resume fixes
- Yellow Carp display fixes
- MCLK power management fix

----------------------------------------------------------------
Alex Deucher (4):
      drm/amdgpu: add support for IP discovery gc_info table v2
      drm/amdgpu: fix runpm documentation
      drm/amdgpu: always reset the asic in suspend (v2)
      drm/amdgpu: no DC support for headless chips

Angus Wang (1):
      drm/amd/display: Changed pipe split policy to allow for multi-display pipe split

Charlene Liu (1):
      drm/amd/display: fix B0 TMDS deepcolor no dislay issue

Evan Quan (1):
      drm/amdgpu: put SMU into proper state on runpm suspending for BOCO capable platform

Huang Rui (1):
      drm/amdgpu: introduce new amdgpu_fence object to indicate the job embedded fence

Lai, Derek (1):
      drm/amd/display: Added power down for DCN10

Lijo Lazar (1):
      drm/amd/pm: Fix xgmi link control on aldebaran

Nicholas Kazlauskas (3):
      drm/amd/display: Send s0i2_rdy in stream_count == 0 optimization
      drm/amd/display: Set optimize_pwr_state for DCN31
      drm/amd/display: Fix USB4 null pointer dereference in update_psp_stream_config

Prike Liang (1):
      drm/amd/pm: skip setting gfx cgpg in the s0ix suspend-resume

chen gong (1):
      drm/amdgpu: When the VCN(1.0) block is suspended, powergating is explicitly enabled

 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |  17 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |  76 +++++++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |  27 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          | 126 ++++++++++++++-------
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |   4 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |   7 ++
 .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c   |   1 +
 drivers/gpu/drm/amd/display/dc/core/dc_link.c      |   5 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c  |   1 +
 .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c  |   2 +-
 .../drm/amd/display/dc/dcn201/dcn201_resource.c    |   2 +-
 .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c  |   2 +-
 .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c  |   2 +-
 .../drm/amd/display/dc/dcn301/dcn301_resource.c    |   2 +-
 .../drm/amd/display/dc/dcn302/dcn302_resource.c    |   2 +-
 .../drm/amd/display/dc/dcn303/dcn303_resource.c    |   2 +-
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c  |   1 +
 .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c  |  27 ++++-
 .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h  |  31 +++++
 drivers/gpu/drm/amd/include/discovery.h            |  49 ++++++++
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c          |   7 +-
 drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c     |   3 +-
 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c |   2 +-
 23 files changed, 300 insertions(+), 98 deletions(-)

[pull] amdgpu drm-fixes-5.16

[Alex Deucher]

Hi Dave, Daniel,

Fixes for 5.16.

The following changes since commit 2585cf9dfaaddf00b069673f27bb3f8530e2039c:

  Linux 5.16-rc5 (2021-12-12 14:53:01 -0800)

are available in the Git repository at:

  https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-5.16-2021-12-15

for you to fetch changes up to aa464957f7e660abd554f2546a588f6533720e21:

  drm/amd/pm: fix a potential gpu_metrics_table memory leak (2021-12-14 17:59:19 -0500)

----------------------------------------------------------------
amd-drm-fixes-5.16-2021-12-15:

amdgpu:
- Fix RLC register offset
- GMC fix
- Properly cache SMU FW version on Yellow Carp
- Fix missing callback on DCN3.1
- Reset DMCUB before HW init
- Fix for GMC powergating on PCO
- Fix a possible memory leak in GPU metrics table handling on RN

----------------------------------------------------------------
Evan Quan (1):
      drm/amdgpu: correct the wrong cached state for GMC on PICASSO

Hawking Zhang (1):
      drm/amdgpu: don't override default ECO_BITs setting

Lang Yu (1):
      drm/amd/pm: fix a potential gpu_metrics_table memory leak

Le Ma (1):
      drm/amdgpu: correct register access for RLC_JUMP_TABLE_RESTORE

Mario Limonciello (1):
      drm/amd/pm: fix reading SMU FW version from amdgpu_firmware_info on YC

Nicholas Kazlauskas (2):
      drm/amd/display: Set exit_optimized_pwr_state for DCN31
      drm/amd/display: Reset DMCUB before HW init

 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c             | 4 ++--
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c          | 1 -
 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c          | 1 -
 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c          | 1 -
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c             | 8 ++++++++
 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c           | 9 ++++-----
 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c           | 1 -
 drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c           | 1 -
 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c           | 1 -
 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c           | 2 --
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +++++
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 +
 drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c  | 7 ++++++-
 drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c    | 3 +++
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c    | 3 +++
 15 files changed, 32 insertions(+), 16 deletions(-)