[git pull] drm fixes for 5.13-rc2

[git pull] drm fixes for 5.13-rc2

[Dave Airlie]

Hi Linus,

Just realised I got the tag header wrong, these are the rc2 fixes. Not
much here, mostly amdgpu fixes, with a couple of radeon, and a
cosmetic vc4. Two MAINTAINER file updates also.

Dave.

drm-fixes-2021-05-14:
drm fixes for 5.13-rc1

two MAINTAINERS updates.

amdgpu:
- Fixes for flexible array conversions
- Fix sysfs attribute init
- Harvesting fixes
- VCN CG/PG fixes for Picasso

radeon:
- Fixes for flexible array conversions
- Fix for flickering on Oland with multiple 4K displays

vc4:
- drop unused function
The following changes since commit 6efb943b8616ec53a5e444193dccf1af9ad627b5:

  Linux 5.13-rc1 (2021-05-09 14:17:44 -0700)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-05-14

for you to fetch changes up to 08f0cfbf739a5086995f0779bbcb607163128a9a:

  Merge tag 'amd-drm-fixes-5.13-2021-05-13' of
https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-05-14
09:20:04 +1000)

----------------------------------------------------------------
drm fixes for 5.13-rc1

two MAINTAINERS updates.

amdgpu:
- Fixes for flexible array conversions
- Fix sysfs attribute init
- Harvesting fixes
- VCN CG/PG fixes for Picasso

radeon:
- Fixes for flexible array conversions
- Fix for flickering on Oland with multiple 4K displays

vc4:
- drop an used function

----------------------------------------------------------------
Daniel Vetter (1):
      MAINTAINERS: Update address for Emma Anholt

Dave Airlie (2):
      Merge tag 'drm-misc-fixes-2021-05-13' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
      Merge tag 'amd-drm-fixes-5.13-2021-05-13' of
https://gitlab.freedesktop.org/agd5f/linux into drm-fixes

David Ward (1):
      drm/amd/display: Initialize attribute for hdcp_srm sysfs file

Gustavo A. R. Silva (3):
      drm/radeon/ni_dpm: Fix booting bug
      drm/radeon/si_dpm: Fix SMU power state load
      drm/amd/pm: Fix out-of-bounds bug

Jernej Skrabec (1):
      MAINTAINERS: Update my e-mail

Jiapeng Chong (1):
      drm/vc4: remove unused function

Kai-Heng Feng (1):
      drm/radeon/dpm: Disable sclk switching on Oland when two 4K 60Hz
monitors are connected

Likun GAO (1):
      drm/amdgpu: add judgement when add ip blocks (v2)

Likun Gao (1):
      drm/amdgpu: update the method for harvest IP for specific SKU

Maxime Ripard (1):
      Merge drm/drm-fixes into drm-misc-fixes

Sathishkumar S (2):
      drm/amdgpu: set vcn mgcg flag for picasso
      drm/amdgpu: update vcn1.0 Non-DPG suspend sequence

xinhui pan (1):
      drm/ttm: Do not add non-system domain BO into swap list

 .mailmap                                           |   1 +
 MAINTAINERS                                        |  18 +--
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |   1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |  15 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |  28 ++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h      |   1 +
 drivers/gpu/drm/amd/amdgpu/nv.c                    |  38 +++--
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |   3 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |  13 +-
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c |   1 +
 drivers/gpu/drm/amd/include/amd_shared.h           |   6 +
 drivers/gpu/drm/amd/pm/powerplay/si_dpm.c          | 174 ++++++++++----------
 drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h    |  34 ++--
 drivers/gpu/drm/radeon/ni_dpm.c                    | 144 ++++++++---------
 drivers/gpu/drm/radeon/nislands_smc.h              |  34 ++--
 drivers/gpu/drm/radeon/radeon.h                    |   1 +
 drivers/gpu/drm/radeon/radeon_pm.c                 |   8 +
 drivers/gpu/drm/radeon/si_dpm.c                    | 177 +++++++++++----------
 drivers/gpu/drm/radeon/sislands_smc.h              |  34 ++--
 drivers/gpu/drm/vc4/vc4_vec.c                      |   6 -
 20 files changed, 419 insertions(+), 318 deletions(-)

Re: [git pull] drm fixes for 5.13-rc2

[Linus Torvalds]

On Thu, May 13, 2021 at 7:34 PM Dave Airlie <airlied@gmail.com> wrote:
>
> Just realised I got the tag header wrong, these are the rc2 fixes.

Heh. The tag message also says:

> vc4:
> - drop an used function

which just makes me think you may have started drinking early ;)

I fixed it up. Skål!

                 Linus

Re: [git pull] drm fixes for 5.13-rc2

[pr-tracker-bot]

The pull request you sent on Fri, 14 May 2021 12:34:38 +1000:

> git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-05-14

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b5304a4f9ad88a712c26c63691a99c0b9b1b5dc6

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html