Date:   Thu, 1 Oct 2020 16:10:22 +1000
From:   Dave Airlie <airlied@...il.com>
To:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Daniel Vetter <daniel.vetter@...ll.ch>
Cc:     dri-devel <dri-devel@...ts.freedesktop.org>,
        LKML <linux-kernel@...r.kernel.org>
Subject: [git pull] drm amdgpu + vmwgfx fixes for 5.9-rc8

Hi Linus,

Just dequeuing these a bit early as the AMD ones are bit larger than
I'd prefer, but Alex missed last week so it's a double set of fixes.
The larger ones are just register header fixes for the new chips that
were just introduced in rc1 along with some new PCI IDs for new hw.
Otherwise it is usual fixes.

The vmwgfx fix was due to some testing I was doing and found we
weren't booting properly, vmware had the fix internally so hurried it
out to me.

I'm off tomorrow and Monday but I'll be around in case there are any
major issues with this, or if I get set of intel or misc fixes come
in.

Dave.

drm-fixes-2020-10-01-1:
drm amd/vmwgfx fixes for 5.9-rc8

vmwgfx:
- fix a regression due to TTM refactor

amdgpu:
- Fix potential double free in userptr handling
- Sienna Cichlid and Navy Flounder updates
- Add Sienna Cichlid PCI IDs
- Drop experimental flag for navi12
- Raven fixes
- Renoir fixes
- HDCP fix
- DCN3 fix for clang and older versions of gcc
- Fix a runtime pm refcount issue
The following changes since commit a1b8638ba1320e6684aa98233c15255eb803fac7:

  Linux 5.9-rc7 (2020-09-27 14:38:10 -0700)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-10-01-1

for you to fetch changes up to 132d7c8abeaa6b10ed5f47330b0f06c6dd220a43:

  Merge tag 'amd-drm-fixes-5.9-2020-09-30' of
git://people.freedesktop.org/~agd5f/linux into drm-fixes (2020-10-01
15:25:33 +1000)

----------------------------------------------------------------
drm amd/vmwgfx fixes for 5.9-rc8

vmwgfx:
- fix a regression due to TTM refactor

amdgpu:
- Fix potential double free in userptr handling
- Sienna Cichlid and Navy Flounder udpates
- Add Sienna Cichlid PCI IDs
- Drop experimental flag for navi12
- Raven fixes
- Renoir fixes
- HDCP fix
- DCN3 fix for clang and older versions of gcc
- Fix a runtime pm refcount issue

----------------------------------------------------------------
Alex Deucher (6):
      drm/amdgpu: add the GC 10.3 VRS registers
      drm/amdgpu: add VCN 3.0 AV1 registers
      drm/amdgpu: use the AV1 defines for VCN 3.0
      drm/amdgpu: remove experimental flag from navi12
      drm/amdgpu/display: fix CFLAGS setup for DCN30
      drm/amdgpu/swsmu/smu12: fix force clock handling for mclk

Dave Airlie (2):
      Merge branch 'vmwgfx-fixes-5.9' of
git://people.freedesktop.org/~sroland/linux into drm-fixes
      Merge tag 'amd-drm-fixes-5.9-2020-09-30' of
git://people.freedesktop.org/~agd5f/linux into drm-fixes

Dirk Gouders (1):
      drm/amd/display: remove duplicate call to rn_vbios_smu_get_smu_version()

Evan Quan (1):
      drm/amd/pm: setup APU dpm clock table in SMU HW initialization

Flora Cui (1):
      drm/amd/display: fix return value check for hdcp_work

Jean Delvare (1):
      drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config

Jiansong Chen (2):
      drm/amdgpu: remove gpu_info fw support for sienna_cichlid etc.
      drm/amdgpu: disable gfxoff temporarily for navy_flounder

Likun Gao (1):
      drm/amdgpu: add device ID for sienna_cichlid (v2)

Philip Yang (1):
      drm/amdgpu: prevent double kfree ttm->sg

Sudheesh Mavila (1):
      drm/amd/pm: Removed fixed clock in auto mode DPM

Zack Rusin (1):
      drm/vmwgfx: Fix error handling in get_node

 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         | 10 +----
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            | 12 +++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |  1 +
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |  3 ++
 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c              | 16 +++----
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c |  2 +-
 .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c  |  1 -
 drivers/gpu/drm/amd/display/dc/dcn30/Makefile      | 18 +++++++-
 .../amd/include/asic_reg/gc/gc_10_3_0_default.h    |  2 +
 .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h |  4 ++
 .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h    | 50 ++++++++++++++++++++++
 .../amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h   | 34 +++++++++++++++
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c         | 22 +++++-----
 drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c  | 10 +++--
 drivers/gpu/drm/amd/powerplay/renoir_ppt.c         |  8 ++--
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |  2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c                |  2 +-
 18 files changed, 156 insertions(+), 43 deletions(-)

Powered by blists - more mailing lists